cookstyle 6.0.19 → 6.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8630cadf214ce92de0f6c69de2951015e6930943b7fe4e987a0ac5ab0191d73e
-  data.tar.gz: 4aa39f4879f6eb93bf2ff9cd7922e471eb366d62992474ced13c7f9ac27e0108
+  metadata.gz: 2b60366fb42569f18aa8b379dff84bcceeb8ecb6b5feb52753cbd9c41575fd2c
+  data.tar.gz: '098c9ff5b266289457e5127b41eb1662191b4453dc0d31fb9a7955ea1774d995'
 SHA512:
-  metadata.gz: 7a5aedf9341dd80db77974b72c8e4a07f1aeb2a583764f9d7232ee57860c1e5e3433eb0dcecaadaf45abfc2256d9ca64f220a74747feeb90458931c7a6ca0846
-  data.tar.gz: 292a4016ac850e050005a7b2f686d8d6c41201372ccb747457cd74eab46ccbbc60f4eac7ed70576829578509a996e58e987f7b4e1c6b9bd49aebac314c60ed4f
+  metadata.gz: 94a5cc1725f5264bc1d6abf84e5d8e8bc1e954609ea8ab5a080db7df7db0fc3333ba4d2a53199279f28e3b7567e2f22fe70c1c3564c1b11bd19e6d520790a02c
+  data.tar.gz: 113a4e827cd32b5c20e2fbc6ee561255d7a3f1508d930851f799aa6e8bc3d4ae850071fb3f302771cc5774ffec9d80bcd1e392e53e0f713d96acc0e41dee4bbb

data/config/cookstyle.yml

@@ -341,6 +341,15 @@ ChefCorrectness/PowershellScriptDeleteFile:
     - '**/metadata.rb'
     - '**/Berksfile'
 
+ChefCorrectness/ConditionalRubyShellout:
+  Description: Don't use Ruby to shellout in an only_if / not_if conditional when you can shellout directly by wrapping the command in quotes.
+  Enabled: true
+  VersionAdded: '6.1.0'
+  Exclude:
+    - '**/attributes/*.rb'
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # ChefSharing: Issues that prevent sharing code with other teams or with the Chef community in general
 ###############################
@@ -377,6 +386,21 @@ ChefSharing/EmptyMetadataField:
   Include:
     - '**/metadata.rb'
 
+ChefSharing/IncludePropertyDescriptions:
+  Description: Properties should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Enabled: false
+  VersionAdded: '6.1.0'
+  Include:
+    - '**/libraries/*.rb'
+    - '**/resources/*.rb'
+
+ChefSharing/IncludeResourceDescriptions:
+  Description: Resources should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Enabled: false
+  VersionAdded: '6.1.0'
+  Include:
+    - '**/resources/*.rb'
+
 ###############################
 # ChefDeprecations: Resolving Deprecations that block upgrading Chef Infra Client
 ###############################
@@ -774,6 +798,22 @@ ChefDeprecations/ResourceWithoutNameOrProvides:
   Include:
     - '**/libraries/*.rb'
 
+ChefDeprecations/WindowsVersionHelpers:
+  Description: Use node['platform_version'] data instead of the Windows::VersionHelper helper from the Windows cookbook.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
+ChefDeprecations/PowershellCookbookHelpers:
+  Description: Use node['powershell']['version'] or the new powershell_version helper available in Chef Infra Client 16+ instead of the deprecated PowerShell cookbook helpers.
+  Enabled: true
+  VersionAdded: '6.1.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # ChefModernize: Cleaning up legacy code and using new built-in resources
 ###############################
@@ -867,13 +907,6 @@ ChefModernize/ExecuteAptUpdate:
   Exclude:
     - '**/metadata.rb'
 
-ChefModernize/WindowsVersionHelper:
-  Description: Use node['platform_version'] data instead of the Windows::VersionHelper helper from the Windows cookbook.
-  Enabled: true
-  VersionAdded: '5.4.0'
-  Exclude:
-    - '**/metadata.rb'
-
 ChefModernize/MinitestHandlerUsage:
   Description: Use Chef InSpec for testing instead of the Minitest Handler cookbook pattern.
   Enabled: true
@@ -1224,6 +1257,14 @@ ChefModernize/DatabagHelpers:
     - '**/metadata.rb'
     - '**/Berksfile'
 
+ChefModernize/NodeRolesInclude:
+  Description: Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`.
+  Enabled: true
+  VersionAdded: '6.1.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # ChefRedundantCode: Cleanup unnecessary code in your cookbooks regardless of Chef Infra Client release
 ###############################

data/lib/cookstyle/version.rb

@@ -1,4 +1,4 @@
 module Cookstyle
-  VERSION = "6.0.19".freeze # rubocop: disable Style/StringLiterals
+  VERSION = "6.1.6".freeze # rubocop: disable Style/StringLiterals
   RUBOCOP_VERSION = '0.80.1'.freeze
 end

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

@@ -0,0 +1,72 @@
+#
+# Copyright:: 2020, 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 ChefCorrectness
+        # Don't use Ruby to shellout in a only_if / not_if conditional when you can just shellout directly. Any string value used with only_if / not_if is executed in your system's shell and the return code of the command is the result for the not_if / only_if determination.
+        #
+        # @example
+        #
+        #   # bad
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     only_if { system('wget https://www.bar.com/foobar.txt -O /dev/null') }
+        #   end
+        #
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     only_if { shell_out('wget https://www.bar.com/foobar.txt -O /dev/null').exitstatus == 0 }
+        #   end
+        #
+        #   # good
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     only_if 'wget https://www.bar.com/foobar.txt -O /dev/null'
+        #   end
+        #
+        class ConditionalRubyShellout < Cop
+          include RuboCop::Chef::CookbookHelpers
+          MSG = "Don't use Ruby to shellout in an only_if / not_if conditional when you can shellout directly by wrapping the command in quotes.".freeze
+
+          def_node_matcher :conditional_shellout?, <<-PATTERN
+          (block
+            (send nil? ${:only_if :not_if})
+            (args)
+            {(send nil? :system $(str ...))
+             (send (send (send nil? :shell_out $(str ...)) :exitstatus) :== (int 0))
+              })
+          PATTERN
+
+          def on_block(node)
+            conditional_shellout?(node) do
+              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+            end
+          end
+
+          def autocorrect(node)
+            lambda do |corrector|
+              conditional_shellout?(node) do |type, val|
+                corrector.replace(node.loc.expression, "#{type} #{val.source}")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+#
+# Copyright:: 2020, 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 ChefDeprecations
+        # Use node['powershell']['version'] or the new powershell_version helper available in Chef Infra Client 16+ instead of the deprecated PowerShell cookbook helpers
+        #
+        # @example
+        #
+        #   # bad
+        #   Powershell::VersionHelper.powershell_version?('4.0')
+        #
+        #   # good
+        #   node['powershell']['version'].to_f == 4.0
+        #
+        #   # good (Chef Infra Client 16+)
+        #   powershell_version == 4.0
+        #
+        class PowershellCookbookHelpers < Cop
+          MSG = "Use node['powershell']['version'] or the new powershell_version helper available in Chef Infra Client 16+ instead of the deprecated PowerShell cookbook helpers.".freeze
+
+          def_node_matcher :ps_cb_helper?, <<-PATTERN
+          (send
+            (const
+              (const {cbase nil?} :Powershell) :VersionHelper) :powershell_version?
+            $(...))
+          PATTERN
+
+          def on_send(node)
+            ps_cb_helper?(node) do
+              add_offense(node, location: :expression, message: MSG, severity: :warning)
+            end
+          end
+
+          def autocorrect(node)
+            lambda do |corrector|
+              ps_cb_helper?(node) do |ver|
+                corrector.replace(node.loc.expression, "node['powershell']['version'].to_f == #{ver.source}")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+#
+# Copyright:: 2019-2020, 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 ChefDeprecations
+        # Use node['platform_version'] and node['kernel'] data instead of the deprecated Windows::VersionHelper helpers from the Windows cookbook.
+        #
+        # @example
+        #
+        #   # bad
+        #   Windows::VersionHelper.nt_version
+        #   Windows::VersionHelper.server_version?
+        #   Windows::VersionHelper.core_version?
+        #   Windows::VersionHelper.workstation_version?
+        #
+        #   # good
+        #   node['platform_version'].to_f
+        #   node['kernel']['product_type'] == 'Server'
+        #   node['kernel']['server_core']
+        #   node['kernel']['product_type'] == 'Workstation'
+        #
+        class WindowsVersionHelpers < Cop
+          extend TargetChefVersion
+
+          minimum_target_chef_version '14.0'
+
+          MSG = "Use node['platform_version'] and node['kernel'] data introduced in Chef Infra Client 14 instead of the deprecated Windows::VersionHelper helpers from the Windows cookbook.".freeze
+
+          def_node_matcher :windows_helper?, <<-PATTERN
+            (send ( const ( const {nil? cbase} :Windows ) :VersionHelper ) $_ )
+          PATTERN
+
+          def on_send(node)
+            windows_helper?(node) do
+              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+            end
+          end
+
+          def autocorrect(node)
+            lambda do |corrector|
+              windows_helper?(node) do |method|
+                case method
+                when :nt_version
+                  corrector.replace(node.loc.expression, 'node[\'platform_version\'].to_f')
+                when :server_version?
+                  corrector.replace(node.loc.expression, 'node[\'kernel\'][\'product_type\'] == \'Server\'')
+                when :core_version?
+                  corrector.replace(node.loc.expression, 'node[\'kernel\'][\'server_core\']')
+                when :workstation_version?
+                  corrector.replace(node.loc.expression, 'node[\'kernel\'][\'product_type\'] == \'Workstation\'')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/effortless/berksfile.rb

@@ -18,9 +18,9 @@
 module RuboCop
   module Cop
     module Chef
-      # Policyfiles should be used for cookbook dependency solving instead of a Berkshelf Berksfile.
-      #
       module ChefEffortless
+        # Policyfiles should be used for cookbook dependency solving instead of a Berkshelf Berksfile.
+        #
         class Berksfile < Cop
           include RangeHelp
 

data/lib/rubocop/cop/chef/modernize/depends_zypper_cookbook.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: 2019, Chef Software, Inc.
+# Copyright:: 2019-2020, Chef Software, Inc.
 # Author:: Tim Smith (<tsmith@chef.io>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefModernize
-        # Don't depend the zypper cookbook as the zypper_repository resource is built into Chef Infra Client 13.3
+        # Don't depend on the zypper cookbook as the zypper_repository resource is built into Chef Infra Client 13.3+
         #
         # @example
         #
@@ -31,7 +31,7 @@ module RuboCop
 
           minimum_target_chef_version '13.3'
 
-          MSG = "Don't include the zypper cookbook as the zypper_repository resource is built into Chef Infra Client 13.3+".freeze
+          MSG = "Don't depend on the zypper cookbook as the zypper_repository resource is built into Chef Infra Client 13.3+".freeze
 
           def_node_matcher :zypper_depends?, <<-PATTERN
             (send nil? :depends (str "zypper"))

data/lib/rubocop/cop/chef/modernize/{windows_version_helper.rb → node_roles_include.rb}

@@ -1,5 +1,5 @@
 #
-# Copyright:: 2019, Chef Software, Inc.
+# Copyright:: 2020, Chef Software, Inc.
 # Author:: Tim Smith (<tsmith@chef.io>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,28 +18,40 @@ module RuboCop
   module Cop
     module Chef
       module ChefModernize
-        # Use node['platform_version] data instead of the Windows::VersionHelper helper from the Windows cookbook.
+        # Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`.
         #
         # @example
         #
         #   # bad
-        #   Windows::VersionHelper.nt_version
+        #   node['roles'].include?('foo')
         #
         #   # good
-        #   node['platform_version].to_i
+        #   node.role?('foo')
         #
-        class WindowsVersionHelper < Cop
-          MSG = "Use node['platform_version'] data instead of the Windows::VersionHelper helper from the Windows cookbook.".freeze
+        class NodeRolesInclude < Cop
+          MSG = "Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`.".freeze
 
-          def_node_matcher :windows_helper?, <<-PATTERN
-            (send ( const ( const {nil? cbase} :Windows ) :VersionHelper ) ... )
+          def_node_matcher :node_role_include?, <<-PATTERN
+          (send
+            (send
+              (send nil? :node) :[]
+              (str "roles")) :include?
+            $(...))
           PATTERN
 
           def on_send(node)
-            windows_helper?(node) do
+            node_role_include?(node) do
               add_offense(node, location: :expression, message: MSG, severity: :refactor)
             end
           end
+
+          def autocorrect(node)
+            lambda do |corrector|
+              node_role_include?(node) do |val|
+                corrector.replace(node.loc.expression, "node.role?(#{val.source})")
+              end
+            end
+          end
         end
       end
     end

data/lib/rubocop/cop/chef/modernize/powershell_install_windowsfeature.rb

@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefModernize
-        # Use the windows_feature resource built into Chef Infra Client 15+ instead of the powershell_script resource
+        # Use the windows_feature resource built into Chef Infra Client 14+ instead of the powershell_script resource
         # to run Install-WindowsFeature or Add-WindowsFeature
         #
         # @example
@@ -38,9 +38,9 @@ module RuboCop
           include RuboCop::Chef::CookbookHelpers
           extend TargetChefVersion
 
-          minimum_target_chef_version '13.0'
+          minimum_target_chef_version '14.0'
 
-          MSG = 'Use the windows_feature resource built into Chef Infra Client 13+ instead of using Install-WindowsFeature or Add-WindowsFeature in a powershell_script resource'.freeze
+          MSG = 'Use the windows_feature resource built into Chef Infra Client 14+ instead of using Install-WindowsFeature or Add-WindowsFeature in a powershell_script resource'.freeze
 
           def on_block(node)
             match_property_in_resource?(:powershell_script, 'code', node) do |code_property|

data/lib/rubocop/cop/chef/sharing/include_property_descriptions.rb

@@ -0,0 +1,53 @@
+#
+# Copyright:: Copyright 2020, 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 ChefSharing
+        # Resource properties should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+        #
+        # @example
+        #
+        #   # bad
+        #   property :foo, String
+        #
+        #   # good
+        #   property :foo, String, description: "Set the important thing to..."
+        #
+        class IncludePropertyDescriptions < Cop
+          extend TargetChefVersion
+
+          minimum_target_chef_version '13.9'
+
+          MSG = 'Resource properties should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.'.freeze
+
+          # any method named property being called with a symbol argument and anything else
+          def_node_matcher :property?, '(send nil? :property (sym _) ...)'
+
+          # hash that contains description in any order (that's the <> bit)
+          def_node_search :description_hash, '(hash <(pair (sym :description) ...) ...>)'
+
+          def on_send(node)
+            property?(node) do
+              add_offense(node, location: :expression, message: MSG, severity: :refactor) unless description_hash(processed_source.ast).any?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/sharing/include_resource_descriptions.rb

@@ -0,0 +1,51 @@
+#
+# Copyright:: Copyright 2020, 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 ChefSharing
+        # Resources should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+        #
+        # @example
+        #
+        #   # good
+        #   resource_name :foo
+        #   description "The foo resource is used to do..."
+        #
+        class IncludeResourceDescriptions < Cop
+          include RangeHelp
+          extend TargetChefVersion
+
+          minimum_target_chef_version '13.9'
+
+          MSG = 'Resources should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.'.freeze
+
+          def investigate(processed_source)
+            return if processed_source.blank?
+
+            # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
+            range = source_range(processed_source.buffer, 1, 0)
+
+            add_offense(nil, location: range, message: MSG, severity: :refactor) unless resource_description(processed_source.ast).any?
+          end
+
+          def_node_search :resource_description, '(send nil? :description str ...)'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 6.0.19
+  version: 6.1.6
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -52,6 +52,7 @@ files:
 - lib/rubocop/cop/chef/correctness/block_guard_clause_string_only.rb
 - lib/rubocop/cop/chef/correctness/cb_depends_on_self.rb
 - lib/rubocop/cop/chef/correctness/chef_application_fatal.rb
+- lib/rubocop/cop/chef/correctness/conditional_ruby_shellout.rb
 - lib/rubocop/cop/chef/correctness/dnf_package_allow_downgrades.rb
 - lib/rubocop/cop/chef/correctness/incorrect_library_injection.rb
 - lib/rubocop/cop/chef/correctness/invalid_notification_timing.rb
@@ -109,6 +110,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/partial_search_class_usage.rb
 - lib/rubocop/cop/chef/deprecation/partial_search_helper_usage.rb
 - lib/rubocop/cop/chef/deprecation/poise_archive.rb
+- lib/rubocop/cop/chef/deprecation/powershell_cookbook_helpers.rb
 - lib/rubocop/cop/chef/deprecation/require_recipe.rb
 - lib/rubocop/cop/chef/deprecation/resource_overrides_provides_method.rb
 - lib/rubocop/cop/chef/deprecation/resource_uses_dsl_name_method.rb
@@ -123,6 +125,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/verify_property_file_expansion.rb
 - lib/rubocop/cop/chef/deprecation/windows_feature_servermanagercmd.rb
 - lib/rubocop/cop/chef/deprecation/windows_task_change_action.rb
+- lib/rubocop/cop/chef/deprecation/windows_version_helpers.rb
 - lib/rubocop/cop/chef/deprecation/xml_ruby_recipe.rb
 - lib/rubocop/cop/chef/deprecation/yum_dnf_compat_recipe.rb
 - lib/rubocop/cop/chef/effortless/berksfile.rb
@@ -159,6 +162,7 @@ files:
 - lib/rubocop/cop/chef/modernize/macos_user_defaults.rb
 - lib/rubocop/cop/chef/modernize/minitest_handler_usage.rb
 - lib/rubocop/cop/chef/modernize/node_init_package.rb
+- lib/rubocop/cop/chef/modernize/node_roles_include.rb
 - lib/rubocop/cop/chef/modernize/ohai_default_recipe.rb
 - lib/rubocop/cop/chef/modernize/openssl_rsa_key_resource.rb
 - lib/rubocop/cop/chef/modernize/openssl_x509_resource.rb
@@ -186,7 +190,6 @@ files:
 - lib/rubocop/cop/chef/modernize/whyrun_supported_true.rb
 - lib/rubocop/cop/chef/modernize/windows_default_recipe.rb
 - lib/rubocop/cop/chef/modernize/windows_registry_uac.rb
-- lib/rubocop/cop/chef/modernize/windows_version_helper.rb
 - lib/rubocop/cop/chef/modernize/windows_zipfile.rb
 - lib/rubocop/cop/chef/modernize/zipfile_resource.rb
 - lib/rubocop/cop/chef/modernize/zypper_repo.rb
@@ -211,6 +214,8 @@ files:
 - lib/rubocop/cop/chef/redundant/unnecessary_name_property.rb
 - lib/rubocop/cop/chef/sharing/default_maintainer_metadata.rb
 - lib/rubocop/cop/chef/sharing/empty_metadata_field.rb
+- lib/rubocop/cop/chef/sharing/include_property_descriptions.rb
+- lib/rubocop/cop/chef/sharing/include_resource_descriptions.rb
 - lib/rubocop/cop/chef/sharing/insecure_cookbook_url.rb
 - lib/rubocop/cop/chef/sharing/invalid_license_string.rb
 - lib/rubocop/cop/chef/style/attribute_keys.rb