cookstyle 7.20.0 → 7.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1beeee72a35f1c32830c7c968ba50d7a277bed019de89697fb54e232d53cfa3d
-  data.tar.gz: 98a912f077a8d14033a03ace34622f1b651dec2b1aea69e3c7c8121f9c487423
+  metadata.gz: f15883e8b06ca175e673c9bc97a1d33f2e79da76a8f9a3a60ee0262868890ac3
+  data.tar.gz: 518d0db21d8525486fc3406898afecd84bb6d27b52ea49c155a4b8000af39cdb
 SHA512:
-  metadata.gz: b7a79148cf57524f1df2f880fcaea77f82cff8d87f1b2e347c1f0ed39a6629bfd91436caa4c7a6b55d99da6d2429e8bea99d9feeb78bc29585458bddf739f4a1
-  data.tar.gz: 6793431fc22cb1de03923569fcf0d2fb57fe3e0b646df99579752fa999d1898956b799dd2734b1e0459bc156fb48081ba685ad0fbedd45204b3b45a9438a5101
+  metadata.gz: 53bde638d1b3829cfece0f84c9d9d25cc69c6d775181155ef154fcc40b310daefb1a01ed424db39e16fcff7fb61fe01469ee3b6cf8d1e320b2dd58f212b70145
+  data.tar.gz: d24b861cf7b56441c16e2be78fc97650ab093b70fc7734c8b3ee8fa889f2e60406026e23af3b19da3984c4050bf2c1e763d50d5f09a59c55af61bee4cc88e577

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 group :debug do
   gem 'pry'
   gem 'pry-byebug'
-  gem 'pry-stack_explorer', '< 0.4.13' # 0.4.13+ drops support for Ruby < 2.6
+  gem 'pry-stack_explorer', '<= 0.4.13' # 0.4.13+ drops support for Ruby < 2.6
 end
 
 group :docs do

data/config/cookstyle.yml

@@ -482,7 +482,7 @@ Chef/Correctness/OctalModeAsString:
     - '**/Berksfile'
 
 Chef/Correctness/MetadataMalformedDepends:
-  Description: Don't represent file modes as strings containing octal values. Use standard base 10 file modes instead.
+  Description: metadata.rb cookbook dependencies and version constraints should be comma separated.
   StyleGuide: 'chef_correctness_metadatamalformeddepends'
   Enabled: true
   VersionAdded: '7.16'
@@ -979,7 +979,7 @@ Chef/Deprecations/DeprecatedPlatformMethods:
     - '**/providers/*.rb'
 
 Chef/Deprecations/DeprecatedChefSpecPlatform:
-  Description: Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3
+  Description: Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3
   StyleGuide: 'chef_deprecations_deprecatedchefspecplatform'
   Enabled: true
   VersionAdded: '5.20.0'
@@ -1198,7 +1198,7 @@ Chef/Deprecations/DeprecatedYumRepositoryActions:
     - '**/Rakefile'
 
 Chef/Deprecations/ChefSugarHelpers:
-  Description: Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started
+  Description: Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/main/chef-utils#getting-started
   StyleGuide: 'chef_deprecations_chefsugarhelpers'
   Enabled: true
   VersionAdded: '7.3.0'
@@ -1263,7 +1263,7 @@ Chef/Deprecations/DependsOnChefReportingCookbook:
     - '**/metadata.rb'
 
 Chef/Deprecations/DependsOnOmnibusUpdaterCookbook:
-  Description: Don't depend on the EOL `omnibus_updater` cookbook. This cookbook no longer works with newer Chef Infra Client releases and has been replaced by with the more reliable `chef_client_updater` cookbook.
+  Description: Don't depend on the EOL `omnibus_updater` cookbook. This cookbook no longer works with newer Chef Infra Client releases and has been replaced with the more reliable `chef_client_updater` cookbook.
   StyleGuide: 'chef_deprecations_dependsonomnibusupdatercookbook'
   Enabled: true
   VersionAdded: '7.20.0'
@@ -1889,13 +1889,50 @@ Chef/Modernize/DependsOnChocolateyCookbooks:
     - '**/metadata.rb'
 
 Chef/Modernize/DependsOnOpensslCookbook:
-  Description: Don't depend on the openssl cookbook which was made obsolete by Chef Infra Client 14.4. All openssl resource are now included directly in Chef Infra Client.
+  Description: Don't depend on the `openssl` cookbook which was made obsolete by Chef Infra Client 14.4. All `openssl_*` resources are now included directly in Chef Infra Client.
   StyleGuide: 'chef_modernize_dependsonopensslcookbook'
   Enabled: true
   VersionAdded: '7.20.0'
   Include:
     - '**/metadata.rb'
 
+Chef/Modernize/UseChefLanguageEnvHelpers:
+  Description: Chef Infra Client 15.5 and later include a large number of new helpers in the Chef Infra Language to simplify checking the system configuration in recipes and resources. These should be used when possible over more complex attributes or ENV var comparisons.
+  StyleGuide: 'chef_modernize_usecheflanguageenvhelpers'
+  Enabled: true
+  VersionAdded: '7.21.0'
+  Include:
+    - '**/resources/*.rb'
+    - '**/providers/*.rb'
+    - '**/recipes/*.rb'
+
+Chef/Modernize/UseChefLanguageCloudHelpers:
+  Description: Chef Infra Client 15.5 and later include cloud helpers to make detecting instances that run on public and private clouds easier.
+  StyleGuide: 'chef_modernize_usecheflanguagecloudhelpers'
+  Enabled: true
+  VersionAdded: '7.22.0'
+  Include:
+    - '**/resources/*.rb'
+    - '**/providers/*.rb'
+    - '**/recipes/*.rb'
+    
+Chef/Modernize/ClassEvalActionClass:
+  Description: In Chef Infra Client 12.9 and later it is no longer necessary to call the class_eval method on the action class block.
+  StyleGuide: 'chef_modernize_classevalactionclass'
+  Enabled: true
+  VersionAdded: '7.23.0'
+  Include:
+    - '**/resources/*.rb'
+
+Chef/Modernize/UseChefLanguageSystemdHelper:
+  Description: Chef Infra Client 15.5 and later include a `systemd?` helper for checking if a Linux system uses systemd.
+  StyleGuide: 'chef_modernize_usecheflanguagesystemdhelper'
+  Enabled: true
+  VersionAdded: '7.24.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # Chef/RedundantCode: Cleanup unnecessary code in your cookbooks regardless of Chef Infra Client release
 ###############################

data/config/disable_all.yml

@@ -5,6 +5,8 @@ Bundler/DuplicatedGem:
   Enabled: false
 Bundler/GemComment:
   Enabled: false
+Bundler/GemFilename:
+  Enabled: false
 Bundler/GemVersion:
   Enabled: false
 Bundler/InsecureProtocolSource:

data/config/upstream.yml

@@ -174,6 +174,20 @@ Bundler/GemComment:
   IgnoredGems: []
   OnlyFor: []
 
+Bundler/GemFilename:
+  Description: 'Enforces the filename for managing gems.'
+  Enabled: true
+  VersionAdded: '1.20'
+  EnforcedStyle: 'Gemfile'
+  SupportedStyles:
+    - 'Gemfile'
+    - 'gems.rb'
+  Include:
+    - '**/Gemfile'
+    - '**/gems.rb'
+    - '**/Gemfile.lock'
+    - '**/gems.locked'
+
 Bundler/GemVersion:
   Description: 'Requires or forbids specifying gem versions.'
   Enabled: false
@@ -1519,6 +1533,11 @@ Lint/Debugger:
     Capybara:
       - save_and_open_page
       - save_and_open_screenshot
+    debug.rb:
+      - binding.b
+      - binding.break
+      - Kernel.binding.b
+      - Kernel.binding.break
     Pry:
       - binding.pry
       - binding.remote_pry
@@ -1527,6 +1546,8 @@ Lint/Debugger:
     Rails:
       - debugger
       - Kernel.debugger
+    RubyJard:
+      - jard
     WebConsole:
       - binding.console
 
@@ -3149,7 +3170,7 @@ Style/CommentAnnotation:
   StyleGuide: '#annotate-keywords'
   Enabled: true
   VersionAdded: '0.10'
-  VersionChanged: '1.3'
+  VersionChanged: '1.20'
   Keywords:
     - TODO
     - FIXME
@@ -4692,8 +4713,9 @@ Style/StructInheritance:
   Description: 'Checks for inheritance from Struct.new.'
   StyleGuide: '#no-extend-struct-new'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.29'
-  VersionChanged: '0.86'
+  VersionChanged: '1.20'
 
 Style/SwapValues:
   Description: 'This cop enforces the use of shorthand-style swapping of 2 variables.'

data/cookstyle.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata = {
     'homepage_uri' => 'https://github.com/chef/cookstyle',
-    'changelog_uri' => 'https://github.com/chef/cookstyle/blob/master/CHANGELOG.md',
+    'changelog_uri' => 'https://github.com/chef/cookstyle/blob/main/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/chef/cookstyle',
     'documentation_uri' => 'https://docs.chef.io/workstation/cookstyle/',
     'bug_tracker_uri' => 'https://github.com/chef/cookstyle/issues',

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.20.0" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.19.0'
+  VERSION = "7.24.1" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.20.0'
 end

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # metadata.rb cookbook dependencies and version constraints should be comma separated
+        # metadata.rb cookbook dependencies and version constraints should be comma separated.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started
+        # Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/main/chef-utils#getting-started
         #
         # @example
         #
@@ -42,7 +42,7 @@ module RuboCop
         #   opensolaris?
         #
         class ChefSugarHelpers < Base
-          MSG = 'Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started'
+          MSG = 'Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/main/chef-utils#getting-started'
           RESTRICT_ON_SEND = [:vagrant_key?, :vagrant_domain?, :vagrant_user?, :require_chef_gem, :best_ip_for, :nexus?, :ios_xr?, :ruby_20?, :ruby_19?, :includes_recipe?, :wrlinux?, :dev_null, :nexentacore_platform?, :opensolaris_platform?, :nexentacore?, :opensolaris?].freeze
 
           def on_send(node)

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't depend on the EOL `omnibus_updater` cookbook. This cookbook no longer works with newer Chef Infra Client releases and has been replaced by with the more reliable `chef_client_updater` cookbook.
+        # Don't depend on the EOL `omnibus_updater` cookbook. This cookbook no longer works with newer Chef Infra Client releases and has been replaced with the more reliable `chef_client_updater` cookbook.
         #
         # @example
         #
@@ -33,7 +33,7 @@ module RuboCop
           extend AutoCorrector
           include RangeHelp
 
-          MSG = "Don't depend on the EOL `omnibus_updater` cookbook. This cookbook no longer works with newer Chef Infra Client releases and has been replaced by with the more reliable `chef_client_updater` cookbook."
+          MSG = "Don't depend on the EOL `omnibus_updater` cookbook. This cookbook no longer works with newer Chef Infra Client releases and has been replaced with the more reliable `chef_client_updater` cookbook."
           RESTRICT_ON_SEND = [:depends].freeze
 
           def_node_matcher :legacy_depends?, <<-PATTERN

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version values so it's always best to be less specific ie. 10 instead of 10.3
+        # Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version values so it's always best to be less specific ie. 10 instead of 10.3
         #
         # @example
         #
@@ -29,7 +29,7 @@ module RuboCop
           include RuboCop::Chef::CookbookHelpers
           extend AutoCorrector
 
-          MSG = "Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3"
+          MSG = "Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3"
 
           DEPRECATED_MAPPING = {
             'amazon' => {

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Chef Infra Client 15.3 and later include a new Unified Mode that simplies the execution of resoures by replace the traditional compile and converge phases with a single phase. Unified mode simplies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will beging warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
+        # Chef Infra Client 15.3 and later include a new Unified Mode that simplifies the execution of resources by replace the traditional compile and converge phases with a single phase. Unified mode simplifies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will begin warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Chef Infra Client 15.3 and later include a new Unified Mode that simplies the execution of resoures by replace the traditional compile and converge phases with a single phase. Unified mode simplies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will beging warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
+        # Chef Infra Client 15.3 and later include a new Unified Mode that simplifies the execution of resources by replace the traditional compile and converge phases with a single phase. Unified mode simplifies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will begin warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
         #
         # @example
         #

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2021, 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 Modernize
+        # In Chef Infra Client 12.9 and later it is no longer necessary to call the class_eval method on the action class block.
+        #
+        # @example
+        #
+        #   #### incorrect
+        #   action_class.class_eval do
+        #     foo
+        #   end
+        #
+        #   #### correct
+        #   action_class do
+        #     foo
+        #   end
+        #
+        class ClassEvalActionClass < Base
+          extend TargetChefVersion
+          extend AutoCorrector
+
+          minimum_target_chef_version '12.9'
+
+          MSG = 'In Chef Infra Client 12.9 and later it is no longer necessary to call the class_eval method on the action class block.'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
+
+          def_node_matcher :class_eval_action_class?, <<-PATTERN
+            (block
+              (send
+                (send nil? :action_class) :class_eval)
+              (args)
+              ... )
+          PATTERN
+
+          def on_block(node)
+            class_eval_action_class?(node) do
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node, node.source.gsub('.class_eval', ''))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Modernize
-        # Don't depend on the openssl cookbook which was made obsolete by Chef Infra Client 14.4. All openssl resource are now included directly in Chef Infra Client.
+        # Don't depend on the `openssl` cookbook which was made obsolete by Chef Infra Client 14.4. All `openssl_*` resources are now included directly in Chef Infra Client.
         #
         # @example
         #
@@ -33,7 +33,7 @@ module RuboCop
 
           minimum_target_chef_version '14.4'
 
-          MSG = "Don't depend on the openssl cookbook which was made obsolete by Chef Infra Client 14.4. All openssl resource are now included directly in Chef Infra Client."
+          MSG = "Don't depend on the `openssl` cookbook which was made obsolete by Chef Infra Client 14.4. All `openssl_*` resources are now included directly in Chef Infra Client."
           RESTRICT_ON_SEND = [:depends].freeze
 
           def_node_matcher :legacy_depends?, <<-PATTERN

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

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2021, 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 Modernize
+        # Chef Infra Client 15.5 and later include cloud helpers to make detecting instances that run on public and private clouds easier.
+        #
+        # @example
+        #
+        #   #### incorrect
+        #   node['cloud']['provider'] == 'alibaba'
+        #   node['cloud']['provider'] == 'ec2'
+        #   node['cloud']['provider'] == 'gce'
+        #   node['cloud']['provider'] == 'rackspace'
+        #   node['cloud']['provider'] == 'eucalyptus'
+        #   node['cloud']['provider'] == 'linode'
+        #   node['cloud']['provider'] == 'openstack'
+        #   node['cloud']['provider'] == 'azure'
+        #   node['cloud']['provider'] == 'digital_ocean'
+        #   node['cloud']['provider'] == 'softlayer'
+        #
+        #   #### correct
+        #   alibaba?
+        #   ec2?
+        #   gce?
+        #   rackspace?
+        #   eucalyptus?
+        #   linode?
+        #   openstack?
+        #   azure?
+        #   digital_ocean?
+        #   softlayer?
+        #
+        class UseChefLanguageCloudHelpers < Base
+          extend AutoCorrector
+          extend TargetChefVersion
+
+          minimum_target_chef_version '15.5'
+
+          MSG = 'Chef Infra Client 15.5 and later include cloud helpers to make detecting instances that run on public and private clouds easier.'
+          RESTRICT_ON_SEND = [:==, :[]].freeze
+          VALID_CLOUDS = %w(alibaba ec2 gce rackspace eucalyptus linode openstack azure digital_ocean softlayer).freeze
+
+          def_node_matcher :provider_comparison?, <<-PATTERN
+            (send
+              (send
+                (send
+                  (send nil? :node) :[]
+                  (str "cloud")) :[]
+                (str "provider")) :==
+              (str $_))
+          PATTERN
+
+          def_node_matcher :node_cloud?, <<-PATTERN
+            (send
+              (send nil? :node) :[]
+              (str "cloud"))
+          PATTERN
+
+          def on_send(node)
+            provider_comparison?(node) do |cloud_name|
+              # skip it if someone was checking for a bogus cloud provider
+              next unless VALID_CLOUDS.include?(cloud_name)
+
+              # if they were checking for node['cloud'] and the provider replace it all
+              node = node.parent if node.parent.and_type? && node_cloud?(node.left_sibling)
+
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node, "#{cloud_name}?")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2021, 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 Modernize
+        # Chef Infra Client 15.5 and later include a large number of new helpers in the Chef Infra Language to simplify checking the system configuration in recipes and resources. These should be used when possible over more complex attributes or ENV var comparisons.
+        #
+        # @example
+        #
+        #   #### incorrect
+        #   ENV['CI']
+        #   ENV['TEST_KITCHEN']
+        #
+        #   #### correct
+        #   ci?
+        #   kitchen?
+        #
+        class UseChefLanguageEnvHelpers < Base
+          extend AutoCorrector
+          extend TargetChefVersion
+
+          minimum_target_chef_version '15.5'
+
+          RESTRICT_ON_SEND = [:[]].freeze
+
+          def_node_matcher :env?, <<-PATTERN
+            (send
+              (const nil? :ENV) :[]
+              (str ${"TEST_KITCHEN" "CI"}))
+          PATTERN
+
+          def on_send(node)
+            env?(node) do |env_value|
+              # we don't handle .nil? checks yet so just skip them
+              next if node.parent.send_type? && node.parent.method_name == :nil?
+
+              case env_value
+              when 'CI'
+                add_offense(node, message: 'Chef Infra Client 15.5 and later include a helper `ci?` that should be used to see if the `CI` env var is set.', severity: :refactor) do |corrector|
+                  corrector.replace(node, 'ci?')
+                end
+              when 'TEST_KITCHEN'
+                add_offense(node, message: 'Chef Infra Client 15.5 and later include a helper `kitchen?` that should be used to see if the `TEST_KITCHEN` env var is set.', severity: :refactor) do |corrector|
+                  corrector.replace(node, 'kitchen?')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2021, 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 Modernize
+        # Chef Infra Client 15.5 and later include a `systemd?` helper for checking if a Linux system uses systemd.
+        #
+        # @example
+        #
+        #   #### incorrect
+        #   node['init_package'] == 'systemd'
+        #
+        #   #### correct
+        #   systemd?
+        #
+        class UseChefLanguageSystemdHelper < Base
+          extend AutoCorrector
+          extend TargetChefVersion
+
+          minimum_target_chef_version '15.5'
+
+          MSG = 'Chef Infra Client 15.5 and later include a `systemd?` helper for checking if a Linux system uses systemd.'
+          RESTRICT_ON_SEND = [:==].freeze
+
+          def_node_matcher :node_init_package?, <<-PATTERN
+              (send
+                (send
+                  (send nil? :node) :[]
+                  (str "init_package")) :==
+                (str "systemd"))
+            PATTERN
+
+          def on_send(node)
+            node_init_package?(node) do |_cloud_name|
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node, 'systemd?')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/style/immediate_notification_timing.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Style
-        # Use :immediately instead of :immediate for resource notification timing
+        # Use :immediately instead of :immediate for resource notification timing.
         #
         # @example
         #
@@ -39,10 +39,10 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Use :immediately instead of :immediate for resource notification timing'
-          RESTRICT_ON_SEND = [:notifies].freeze
+          RESTRICT_ON_SEND = [:notifies, :subscribes].freeze
 
           def_node_matcher :immediate_notify?, <<-PATTERN
-            (send nil? :notifies (sym _) (...) $(sym :immediate))
+            (send nil? {:notifies :subscribes} (sym _) (...) $(sym :immediate))
           PATTERN
 
           def on_send(node)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.20.0
+  version: 7.24.1
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
 description: 
 email:
 - thom@chef.io
@@ -181,6 +181,7 @@ files:
 - lib/rubocop/cop/chef/modernize/chef_14_resources.rb
 - lib/rubocop/cop/chef/modernize/chef_15_resources.rb
 - lib/rubocop/cop/chef/modernize/chef_gem_nokogiri.rb
+- lib/rubocop/cop/chef/modernize/class_eval_action_class.rb
 - lib/rubocop/cop/chef/modernize/compile_time_resources.rb
 - lib/rubocop/cop/chef/modernize/conditional_using_test.rb
 - lib/rubocop/cop/chef/modernize/cron_d_file_or_template.rb
@@ -236,6 +237,9 @@ files:
 - lib/rubocop/cop/chef/modernize/simplify_apt_ppa_setup.rb
 - lib/rubocop/cop/chef/modernize/sysctl_param_resource.rb
 - lib/rubocop/cop/chef/modernize/unnecessary_mixlib_shellout_require.rb
+- lib/rubocop/cop/chef/modernize/use_chef_language_cloud_helpers.rb
+- lib/rubocop/cop/chef/modernize/use_chef_language_env_helpers.rb
+- lib/rubocop/cop/chef/modernize/use_chef_language_systemd_helper.rb
 - lib/rubocop/cop/chef/modernize/use_multipackage_installs.rb
 - lib/rubocop/cop/chef/modernize/use_require_relative.rb
 - lib/rubocop/cop/chef/modernize/whyrun_supported_true.rb
@@ -303,7 +307,7 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/chef/cookstyle
-  changelog_uri: https://github.com/chef/cookstyle/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/chef/cookstyle/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/chef/cookstyle
   documentation_uri: https://docs.chef.io/workstation/cookstyle/
   bug_tracker_uri: https://github.com/chef/cookstyle/issues