cookstyle 7.26.1 → 7.30.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0113118edcb59c64b2a176b5f4dc9e4880cedda9cdced9257bdf58901f7ad3
-  data.tar.gz: a0124092a6e81ef8062d6ef14e7deb18cd517ca44d26b03efbc28e6f367be220
+  metadata.gz: 94be7df501ab0a3a055ee36aab695764830d816e3db7005a7b18231d3a703505
+  data.tar.gz: 3cf466a2d3fec655c473df01a769bb9e577359ed04ea3569f6cc6fb0f5c59ea0
 SHA512:
-  metadata.gz: a2be0d6a18f5e3db8a572d2561af13504b7cc752eca1e8fbd9d9d6a443a1d327c6110c93b5541f4c4df98469524f7715c6695bbe41c3489f5459590e194e1cf6
-  data.tar.gz: 24e0423ffdab5c801ebb640332f8cb9156f8069dfc4798b2130ca059d01e9f0b5e7962b422c857e66c303e00ec8054d22275afbb0acf6a2b3e792866de0a7322
+  metadata.gz: 339ccca52365ef809d5976ceadcea5ead13bcef57b294725a26d0f6e5ddfb306f1e003c72d1fd99448640018f0da00d4188ea48adfda39593b2cc02cc541d95e
+  data.tar.gz: d02e13fed47f62938a3e3f3dd07c86c8873294bd9fbb96395534f33419b62084a2814581717c8540db139668a67657e009bb3060432a553b111e99c1d0830bc5

data/config/cookstyle.yml

@@ -506,6 +506,24 @@ Chef/Correctness/MetadataMissingVersion:
   Include:
     - '**/metadata.rb'
 
+Chef/Correctness/InvalidCookbookName:
+  Description: Cookbook names should not contain invalid characters such as periods.
+  StyleGuide: 'chef_correctness_invalidcookbookname'
+  Enabled: true
+  VersionAdded: '7.27'
+  Include:
+    - '**/metadata.rb'
+
+Chef/Correctness/InvalidNotificationResource:
+  Description: The resource to notify when calling `notifies` or `subscribes` must be a string.
+  StyleGuide: 'chef_correctness_invalidnotificationresource'
+  Enabled: true
+  VersionAdded: '7.28'
+  Exclude:
+    - '**/attributes/*.rb'
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # Chef/Sharing: Issues that prevent sharing code with other teams or with the Chef community in general
 ###############################
@@ -2281,6 +2299,24 @@ InSpec/Deprecations/AttributeDefault:
   Include:
     - '**/controls/*.rb'
 
+#### Security Cops
+
+Chef/Security:
+  StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
+
+Chef/Security/ :
+  Description: Do not include plain text SSH private keys in your cookbook code. This sensitive data should be fetched from secrets management systems so that secrets are not uploaded in plain text to the Chef Infra Server or committed to source control systems.
+  StyleGuide: 'chef_security_sshprivatekey'
+  Enabled: true
+  VersionAdded: '7.28'
+  Include:
+    - '**/libraries/*.rb'
+    - '**/resources/*.rb'
+    - '**/providers/*.rb'
+    - '**/recipes/*.rb'
+    - '**/attributes/*.rb'
+    - '**/definitions/*.rb'
+    
 #### The base rubocop 0.37 enabled.yml file we started with ####
 
 Layout/AccessModifierIndentation:

data/config/upstream.yml

@@ -2496,6 +2496,7 @@ Naming/BlockForwarding:
   SupportedStyles:
     - anonymous
     - explicit
+  BlockForwardingName: block
 
 Naming/BlockParameterName:
   Description: >-
@@ -3698,6 +3699,8 @@ Style/HashSyntax:
     - always
     # forces use of explicit hash literal value.
     - never
+    # accepts both shorthand and explicit use of hash literal value.
+    - either
   # Force hashes that have a symbol value to use hash rockets
   UseHashRocketsWithSymbolValues: false
   # Do not suggest { a?: 1 } over { :a? => 1 } in ruby19 style

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.26.1" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.24.1'
+  VERSION = "7.30.3" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.25.0'
 end

data/lib/rubocop/chef/cookbook_helpers.rb

@@ -111,6 +111,8 @@ module RuboCop
         case node.type
         when :send
           yield(node) if node.receiver.nil? # if it's not nil then we're not in a property foo we're in bar.foo
+        when :block # ie: not_if { ruby_foo }
+          yield(node)
         when :while
           extract_send_types(node.body) { |t| yield(t) }
         when :if

data/lib/rubocop/cop/chef/correctness/block_guard_clause_string_only.rb

@@ -48,7 +48,7 @@ module RuboCop
 
           def on_block(node)
             block_guard_with_only_string?(node) do
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 new_val = "#{node.method_name} #{node.body.source}"
                 corrector.replace(node, new_val)
               end

data/lib/rubocop/cop/chef/correctness/chef_application_fatal.rb

@@ -44,7 +44,7 @@ module RuboCop
 
           def on_send(node)
             application_fatal?(node) do |val|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(node, "raise(#{val.source})")
               end
             end

data/lib/rubocop/cop/chef/correctness/conditional_ruby_shellout.rb

@@ -57,7 +57,7 @@ module RuboCop
 
           def on_block(node)
             conditional_shellout?(node) do |type, val|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(node, "#{type} #{val.source}")
               end
             end

data/lib/rubocop/cop/chef/correctness/dnf_package_allow_downgrades.rb

@@ -43,7 +43,7 @@ module RuboCop
 
           def on_block(node)
             match_property_in_resource?(:dnf_package, :allow_downgrades, node) do |prop|
-              add_offense(prop, message: MSG, severity: :refactor) do |corrector|
+              add_offense(prop, severity: :refactor) do |corrector|
                 corrector.remove(range_with_surrounding_space(range: prop.loc.expression, side: :left))
               end
             end

data/lib/rubocop/cop/chef/correctness/incorrect_library_injection.rb

@@ -60,7 +60,7 @@ module RuboCop
 
           def on_send(node)
             legacy_injection?(node) do
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 if node.parent && correct_injection?(node.parent)
                   corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
                 else

data/lib/rubocop/cop/chef/correctness/invalid_cookbook_name.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2022, Chef Software Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# 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.
+#
+module RuboCop
+  module Cop
+    module Chef
+      module Correctness
+        # Cookbook names should not contain invalid characters such as periods.
+        #
+        # @example
+        #
+        #   #### incorrect
+        #   name 'foo.bar'
+        #
+        #   #### correct
+        #   name 'foo_bar'
+        #
+        class InvalidCookbookName < Base
+          RESTRICT_ON_SEND = [:name].freeze
+          MSG = 'Cookbook names should not contain invalid characters such as periods.'
+
+          def_node_matcher :has_name?, '(send nil? :name $str)'
+
+          def on_send(node)
+            has_name?(node) do |val|
+              add_offense(node, severity: :refactor) if val.value.include?('.')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/correctness/invalid_default_action.rb

@@ -38,7 +38,7 @@ module RuboCop
           def on_send(node)
             default_action?(node) do |match|
               return if %i(send sym array).include?(match.type)
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/invalid_notification_resource.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2022, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# 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.
+#
+module RuboCop
+  module Cop
+    module Chef
+      module Correctness
+        # The resource to notify when calling `notifies` or `subscribes` must be a string.
+        #
+        # @example
+        #
+        #   #### incorrect
+        #
+        #   template '/etc/www/configures-apache.conf' do
+        #     notifies :restart, service['apache'], :immediately
+        #   end
+        #
+        #   template '/etc/www/configures-apache.conf' do
+        #     notifies :restart, service[apache], :immediately
+        #   end
+        #
+        #   #### correct
+        #
+        #   template '/etc/www/configures-apache.conf' do
+        #     notifies :restart, 'service[apache]', :immediately
+        #   end
+        #
+        class InvalidNotificationResource < Base
+          MSG = 'The resource to notify when calling `notifies` or `subscribes` must be a string.'
+          RESTRICT_ON_SEND = [:notifies, :subscribes].freeze
+
+          def_node_matcher :invalid_notification?, <<-PATTERN
+            (send nil? {:notifies :subscribes} (sym _) $(send (send nil? _) :[] ...) ...)
+          PATTERN
+
+          def on_send(node)
+            invalid_notification?(node) do |resource|
+              add_offense(resource, severity: :refactor)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/correctness/invalid_notification_timing.rb

@@ -45,7 +45,7 @@ module RuboCop
 
           def on_send(node)
             notification_with_timing?(node) do |timing|
-              add_offense(timing, message: MSG, severity: :refactor) unless %i(immediate immediately delayed before).include?(timing.value)
+              add_offense(timing, severity: :refactor) unless %i(immediate immediately delayed before).include?(timing.value)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/invalid_platform_family_helper.rb

@@ -47,7 +47,7 @@ module RuboCop
             platform_family_helper?(node) do |plats|
               plats.to_a.each do |p|
                 next unless INVALID_PLATFORM_FAMILIES.key?(p.value)
-                add_offense(p, message: MSG, severity: :refactor) do |corrector|
+                add_offense(p, severity: :refactor) do |corrector|
                   replacement_platform = INVALID_PLATFORM_FAMILIES[p.value]
                   all_passed_platforms = p.parent.arguments.map(&:value)
 

data/lib/rubocop/cop/chef/correctness/invalid_platform_family_values_in_case.rb

@@ -50,7 +50,7 @@ module RuboCop
                   new_value = INVALID_PLATFORM_FAMILIES[con.str_content]
                   next unless new_value
 
-                  add_offense(con, message: MSG, severity: :refactor) do |corrector|
+                  add_offense(con, severity: :refactor) do |corrector|
                     # if the correct value already exists in the when statement then we just want to delete this node
                     if con.parent.conditions.any? { |x| x.str_content == new_value }
                       range = range_with_surrounding_comma(range_with_surrounding_space(range: con.loc.expression, side: :left), :both)

data/lib/rubocop/cop/chef/correctness/invalid_platform_helper.rb

@@ -46,7 +46,7 @@ module RuboCop
           def on_send(node)
             platform_helper?(node) do |plat|
               plat.to_a.each do |p|
-                add_offense(p, message: MSG, severity: :refactor) if INVALID_PLATFORMS.key?(p.value)
+                add_offense(p, severity: :refactor) if INVALID_PLATFORMS.key?(p.value)
               end
             end
           end

data/lib/rubocop/cop/chef/correctness/invalid_platform_metadata.rb

@@ -52,7 +52,7 @@ module RuboCop
           def on_send(node)
             supports?(node) do |plat|
               next unless INVALID_PLATFORMS[plat.str_content]
-              add_offense(plat, message: MSG, severity: :refactor) do |corrector|
+              add_offense(plat, severity: :refactor) do |corrector|
                 correct_string = corrected_platform_source(plat)
                 next unless correct_string
                 corrector.replace(plat, correct_string)
@@ -64,7 +64,7 @@ module RuboCop
             supports_array?(node) do |plats|
               plats.values.each do |plat|
                 next unless INVALID_PLATFORMS[plat.str_content]
-                add_offense(plat, message: MSG, severity: :refactor) do |corrector|
+                add_offense(plat, severity: :refactor) do |corrector|
                   correct_string = corrected_platform_source(plat)
                   next unless correct_string
                   corrector.replace(plat, correct_string)

data/lib/rubocop/cop/chef/correctness/invalid_platform_values_in_case.rb

@@ -50,7 +50,7 @@ module RuboCop
                   # some invalid platform have no direct correction value and return nil instead
                   next unless new_value
 
-                  add_offense(con, message: MSG, severity: :refactor) do |corrector|
+                  add_offense(con, severity: :refactor) do |corrector|
                     # if the correct value already exists in the when statement then we just want to delete this node
                     if con.parent.conditions.any? { |x| x.str_content == new_value }
                       range = range_with_surrounding_comma(range_with_surrounding_space(range: con.loc.expression, side: :left), :both)

data/lib/rubocop/cop/chef/correctness/invalid_value_for_platform_family_helper.rb

@@ -55,10 +55,10 @@ module RuboCop
                 if p_hash.key.array_type?
                   p_hash.key.values.each do |plat|
                     next unless INVALID_PLATFORM_FAMILIES.key?(plat.value)
-                    add_offense(plat, message: MSG, severity: :refactor)
+                    add_offense(plat, severity: :refactor)
                   end
                 elsif INVALID_PLATFORM_FAMILIES.key?(p_hash.key.value)
-                  add_offense(p_hash.key, message: MSG, severity: :refactor)
+                  add_offense(p_hash.key, severity: :refactor)
                 end
               end
             end

data/lib/rubocop/cop/chef/correctness/invalid_value_for_platform_helper.rb

@@ -54,10 +54,10 @@ module RuboCop
                 if p_hash.key.array_type?
                   p_hash.key.values.each do |plat|
                     next unless INVALID_PLATFORMS.key?(plat.value)
-                    add_offense(plat, message: MSG, severity: :refactor)
+                    add_offense(plat, severity: :refactor)
                   end
                 elsif INVALID_PLATFORMS.key?(p_hash.key.value)
-                  add_offense(p_hash.key, message: MSG, severity: :refactor)
+                  add_offense(p_hash.key, severity: :refactor)
                 end
               end
             end

data/lib/rubocop/cop/chef/correctness/invalid_version_metadata.rb

@@ -38,7 +38,7 @@ module RuboCop
           def on_send(node)
             version?(node) do |ver|
               next if /\A\d+\.\d+(\.\d+)?\z/.match?(ver.value) # entirely borrowed from Foodcritic.
-              add_offense(ver, message: MSG, severity: :refactor)
+              add_offense(ver, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/lazy_eval_node_attribute_defaults.rb

@@ -41,7 +41,7 @@ module RuboCop
 
           def on_send(node)
             non_lazy_node_attribute_default?(node) do |default|
-              add_offense(default, message: MSG, severity: :refactor) do |corrector|
+              add_offense(default, severity: :refactor) do |corrector|
                 corrector.replace(default, "lazy { #{default.source} }")
               end
             end

data/lib/rubocop/cop/chef/correctness/lazy_in_resource_guard.rb

@@ -55,7 +55,7 @@ module RuboCop
 
           def on_block(node)
             lazy_in_guard?(node) do |type, code|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(node, "#{type} { #{code.source} }")
               end
             end

data/lib/rubocop/cop/chef/correctness/macos_userdefaults_invalid_type.rb

@@ -54,7 +54,7 @@ module RuboCop
             match_property_in_resource?(:macos_userdefaults, 'type', node) do |type|
               type_val = method_arg_ast_to_string(type)
               return if VALID_VALUES.include?(type_val)
-              add_offense(type, message: MSG, severity: :refactor) do |corrector|
+              add_offense(type, severity: :refactor) do |corrector|
                 next unless INVALID_VALUE_MAP[type_val]
                 corrector.replace(type, "type '#{INVALID_VALUE_MAP[type_val]}'")
               end

data/lib/rubocop/cop/chef/correctness/metadata_malformed_version.rb

@@ -46,7 +46,7 @@ module RuboCop
 
           def on_send(node)
             depends_without_comma?(node) do |cb, ver|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(node, "depends '#{cb.value}', '#{ver.value}'")
               end
             end

data/lib/rubocop/cop/chef/correctness/metadata_missing_name.rb

@@ -38,7 +38,7 @@ module RuboCop
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             return if cb_name?(processed_source.ast)
             range = source_range(processed_source.buffer, 1, 0)
-            add_offense(range, message: MSG, severity: :refactor) do |corrector|
+            add_offense(range, severity: :refactor) do |corrector|
               path = processed_source.path
               cb_name = File.basename(File.dirname(path))
               corrector.insert_before(processed_source.ast, "name '#{cb_name}'\n")

data/lib/rubocop/cop/chef/correctness/metadata_missing_version.rb

@@ -39,7 +39,7 @@ module RuboCop
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             return if cb_version?(processed_source.ast)
             range = source_range(processed_source.buffer, 1, 0)
-            add_offense(range, message: MSG, severity: :refactor)
+            add_offense(range, severity: :refactor)
           end
         end
       end

data/lib/rubocop/cop/chef/correctness/node_normal.rb

@@ -43,7 +43,7 @@ module RuboCop
 
           def on_send(node)
             node_normal?(node) do
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/node_normal_unless.rb

@@ -43,7 +43,7 @@ module RuboCop
 
           def on_send(node)
             node_normal_unless?(node) do
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/node_save.rb

@@ -36,7 +36,7 @@ module RuboCop
 
           def on_send(node)
             node_save?(node) do
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/notifies_action_not_symbol.rb

@@ -51,7 +51,7 @@ module RuboCop
             match_property_in_resource?(nil, %w(notifies subscribes), node) do |notifies_property|
               return unless notifies_property.node_parts[2].str_type?
 
-              add_offense(notifies_property, message: MSG, severity: :refactor) do |corrector|
+              add_offense(notifies_property, severity: :refactor) do |corrector|
                 corrector.replace(notifies_property.first_argument,
                   ":#{notifies_property.node_parts[2].value}")
               end

data/lib/rubocop/cop/chef/correctness/octal_mode_as_string.rb

@@ -39,7 +39,7 @@ module RuboCop
 
           def on_send(node)
             return unless node.arguments.first&.str_type? && node.arguments.first.value.match?(/^0o/)
-            add_offense(node, message: MSG, severity: :refactor)
+            add_offense(node, severity: :refactor)
           end
         end
       end

data/lib/rubocop/cop/chef/correctness/openssl_password_helpers.rb

@@ -36,7 +36,7 @@ module RuboCop
 
           def on_const(node)
             openssl_helper?(node) do
-              add_offense(node, message: MSG, severity: :warning)
+              add_offense(node, severity: :warning)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/powershell_delete_file.rb

@@ -44,7 +44,7 @@ module RuboCop
               property_data = method_arg_ast_to_string(code_property)
               return unless property_data && property_data.match?(/^remove-item/i) &&
                             !property_data.include?('*')
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/powershell_file_exists.rb

@@ -40,7 +40,7 @@ module RuboCop
           def on_send(node)
             powershell_out_exists?(node) do |exists_string|
               return unless exists_string.match?(/^Test-Path/)
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/property_without_type.rb

@@ -49,7 +49,7 @@ module RuboCop
             property_without_type?(node) do |hash_vals|
               return if hash_vals&.first&.keys&.include?(s(:sym, :kind_of))
 
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/resource_sets_internal_properties.rb

@@ -41,7 +41,7 @@ module RuboCop
 
           def on_block(node)
             match_property_in_resource?(:service, 'running', node) do |prop|
-              add_offense(prop, message: MSG, severity: :refactor)
+              add_offense(prop, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/resource_sets_name_property.rb

@@ -40,7 +40,7 @@ module RuboCop
 
           def on_block(node)
             match_property_in_resource?(nil, 'name', node) do |name_node|
-              add_offense(name_node, message: MSG, severity: :refactor)
+              add_offense(name_node, severity: :refactor)
             end
           end
         end

data/lib/rubocop/cop/chef/correctness/resource_with_none_action.rb

@@ -43,7 +43,7 @@ module RuboCop
             match_property_in_resource?(nil, 'action', node) do |action_node|
               action_node.arguments.each do |action|
                 next unless action.source == ':none'
-                add_offense(action, message: MSG, severity: :refactor) do |corrector|
+                add_offense(action, severity: :refactor) do |corrector|
                   corrector.replace(action, ':nothing')
                 end
               end

data/lib/rubocop/cop/chef/correctness/scoped_file_exist.rb

@@ -40,7 +40,7 @@ module RuboCop
 
           def on_block(node)
             unscoped_file_exist?(node) do |m|
-              add_offense(m, message: MSG, severity: :refactor) do |corrector|
+              add_offense(m, severity: :refactor) do |corrector|
                 corrector.replace(m, '::File')
               end
             end

data/lib/rubocop/cop/chef/correctness/service_resource.rb

@@ -37,7 +37,7 @@ module RuboCop
           def on_send(node)
             execute_command?(node) do |command|
               if starts_service?(command)
-                add_offense(command, message: MSG, severity: :refactor)
+                add_offense(command, severity: :refactor)
               end
             end
           end

data/lib/rubocop/cop/chef/correctness/supports_must_be_float.rb

@@ -40,7 +40,7 @@ module RuboCop
           def on_send(node)
             supports_with_constraint?(node) do |ver|
               return if ver.source.include?('.')
-              add_offense(ver, message: MSG, severity: :refactor) do |corrector|
+              add_offense(ver, severity: :refactor) do |corrector|
                 corrector.replace(ver, ver.source.gsub(ver.value, (ver.value + '.0')))
               end
             end

data/lib/rubocop/cop/chef/correctness/tmp_path.rb

@@ -39,7 +39,7 @@ module RuboCop
           def on_send(node)
             remote_file?(node) do |command|
               return unless hardcoded_tmp?(command) && !file_cache_path?(command)
-              add_offense(command, message: MSG, severity: :refactor)
+              add_offense(command, severity: :refactor)
             end
           end
 

data/lib/rubocop/cop/chef/deprecation/cb_depends_on_self.rb

@@ -44,7 +44,7 @@ module RuboCop
             cb_name?(node) do
               dependencies(processed_source.ast).each do |dep|
                 next unless dep.arguments == node.arguments
-                add_offense(dep, message: MSG, severity: :refactor) do |corrector|
+                add_offense(dep, severity: :refactor) do |corrector|
                   corrector.remove(range_with_surrounding_space(range: dep.loc.expression, side: :left))
                 end
               end

data/lib/rubocop/cop/chef/deprecation/chef_handler_recipe.rb

@@ -40,7 +40,7 @@ module RuboCop
 
           def on_send(node)
             chef_handler_recipe?(node) do
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
               end
             end

data/lib/rubocop/cop/chef/deprecation/chef_handler_supports.rb

@@ -41,7 +41,7 @@ module RuboCop
 
           def on_block(node)
             match_property_in_resource?(:chef_handler, 'supports', node) do |prop_node|
-              add_offense(prop_node, message: MSG, severity: :warning) do |corrector|
+              add_offense(prop_node, severity: :warning) do |corrector|
                 # make sure to delete leading and trailing {}s that would create invalid ruby syntax
                 extracted_val = prop_node.arguments.first.source.gsub(/{|}/, '')
                 corrector.replace(prop_node, "type #{extracted_val}")