cookstyle 8.6.4 → 8.7.6

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

@@ -1,89 +1,89 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2020, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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
-        # Use node['init_package'] to check for systemd instead of reading the contents of '/proc/1/comm'
-        #
-        # @example
-        #
-        #   # bad
-        #   ::File.open('/proc/1/comm').gets.chomp == 'systemd'
-        #   ::File.open('/proc/1/comm').chomp == 'systemd'
-        #   File.open('/proc/1/comm').gets.chomp == 'systemd'
-        #   File.open('/proc/1/comm').chomp == 'systemd'
-        #   IO.read('/proc/1/comm').chomp == 'systemd'
-        #   IO.read('/proc/1/comm').gets.chomp == 'systemd'
-        #   ::IO.read('/proc/1/comm').chomp == 'systemd'
-        #   ::IO.read('/proc/1/comm').gets.chomp == 'systemd'
-        #   File.exist?('/proc/1/comm') && File.open('/proc/1/comm').chomp == 'systemd'
-        #   only_if 'test -f /bin/systemctl && /bin/systemctl'
-        #
-        #   # good
-        #   node['init_package'] == 'systemd'
-        #   only_if { node['init_package'] == 'systemd' }
-        #
-        class NodeInitPackage < Base
-          extend RuboCop::Cop::AutoCorrector
-
-          MSG = "Use node['init_package'] to check for systemd instead of reading the contents of '/proc/1/comm'"
-          RESTRICT_ON_SEND = [:open, :read, :exist?, :==, :not_if, :only_if].freeze
-
-          def_node_matcher :file_reads_proc_1_comm?, <<-PATTERN
-            (send (const {(cbase) nil?} {:File :IO}) {:open :read} (str "/proc/1/comm"))
-          PATTERN
-
-          def_node_matcher :proc_1_comm_exists?, <<-PATTERN
-            (send
-              (const
-                {(cbase) nil?} :File) :exist?
-              (str "/proc/1/comm"))
-          PATTERN
-
-          def_node_matcher :compare_init_system?, <<-PATTERN
-            (send
-              (send {#file_reads_proc_1_comm? (send #file_reads_proc_1_comm? :gets) } :chomp)
-                :== (str "systemd"))
-          PATTERN
-
-          def_node_matcher :file_systemd_conditional?, <<~PATTERN
-            (send nil? {:not_if :only_if} $(str "test -f /bin/systemctl && /bin/systemctl"))
-          PATTERN
-
-          def on_send(node)
-            compare_init_system?(node) do
-              # if there's a ::File.exist?('/proc/1/comm') check first we want to match that as well
-              node = node.parent if node.parent&.and_type? && proc_1_comm_exists?(node.parent.conditions.first)
-
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, "node['init_package'] == 'systemd'")
-              end
-            end
-
-            file_systemd_conditional?(node) do |conditional|
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(conditional, "{ node['init_package'] == 'systemd' }")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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
+        # Use node['init_package'] to check for systemd instead of reading the contents of '/proc/1/comm'
+        #
+        # @example
+        #
+        #   # bad
+        #   ::File.open('/proc/1/comm').gets.chomp == 'systemd'
+        #   ::File.open('/proc/1/comm').chomp == 'systemd'
+        #   File.open('/proc/1/comm').gets.chomp == 'systemd'
+        #   File.open('/proc/1/comm').chomp == 'systemd'
+        #   IO.read('/proc/1/comm').chomp == 'systemd'
+        #   IO.read('/proc/1/comm').gets.chomp == 'systemd'
+        #   ::IO.read('/proc/1/comm').chomp == 'systemd'
+        #   ::IO.read('/proc/1/comm').gets.chomp == 'systemd'
+        #   File.exist?('/proc/1/comm') && File.open('/proc/1/comm').chomp == 'systemd'
+        #   only_if 'test -f /bin/systemctl && /bin/systemctl'
+        #
+        #   # good
+        #   node['init_package'] == 'systemd'
+        #   only_if { node['init_package'] == 'systemd' }
+        #
+        class NodeInitPackage < Base
+          extend RuboCop::Cop::AutoCorrector
+
+          MSG = "Use node['init_package'] to check for systemd instead of reading the contents of '/proc/1/comm'"
+          RESTRICT_ON_SEND = [:open, :read, :exist?, :==, :not_if, :only_if].freeze
+
+          def_node_matcher :file_reads_proc_1_comm?, <<-PATTERN
+            (send (const {(cbase) nil?} {:File :IO}) {:open :read} (str "/proc/1/comm"))
+          PATTERN
+
+          def_node_matcher :proc_1_comm_exists?, <<-PATTERN
+            (send
+              (const
+                {(cbase) nil?} :File) :exist?
+              (str "/proc/1/comm"))
+          PATTERN
+
+          def_node_matcher :compare_init_system?, <<-PATTERN
+            (send
+              (send {#file_reads_proc_1_comm? (send #file_reads_proc_1_comm? :gets) } :chomp)
+                :== (str "systemd"))
+          PATTERN
+
+          def_node_matcher :file_systemd_conditional?, <<~PATTERN
+            (send nil? {:not_if :only_if} $(str "test -f /bin/systemctl && /bin/systemctl"))
+          PATTERN
+
+          def on_send(node)
+            compare_init_system?(node) do
+              # if there's a ::File.exist?('/proc/1/comm') check first we want to match that as well
+              node = node.parent if node.parent&.and_type? && proc_1_comm_exists?(node.parent.conditions.first)
+
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, "node['init_package'] == 'systemd'")
+              end
+            end
+
+            file_systemd_conditional?(node) do |conditional|
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(conditional, "{ node['init_package'] == 'systemd' }")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,57 +1,57 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2020, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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
-        # Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`.
-        #
-        # @example
-        #
-        #   # bad
-        #   node['roles'].include?('foo')
-        #
-        #   # good
-        #   node.role?('foo')
-        #
-        class NodeRolesInclude < Base
-          extend AutoCorrector
-
-          MSG = "Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`."
-          RESTRICT_ON_SEND = [:include?].freeze
-
-          def_node_matcher :node_role_include?, <<-PATTERN
-          (send
-            (send
-              (send nil? :node) :[]
-              (str "roles")) :include?
-            $(...))
-          PATTERN
-
-          def on_send(node)
-            node_role_include?(node) do |val|
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, "node.role?(#{val.source})")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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
+        # Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`.
+        #
+        # @example
+        #
+        #   # bad
+        #   node['roles'].include?('foo')
+        #
+        #   # good
+        #   node.role?('foo')
+        #
+        class NodeRolesInclude < Base
+          extend AutoCorrector
+
+          MSG = "Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`."
+          RESTRICT_ON_SEND = [:include?].freeze
+
+          def_node_matcher :node_role_include?, <<-PATTERN
+          (send
+            (send
+              (send nil? :node) :[]
+              (str "roles")) :include?
+            $(...))
+          PATTERN
+
+          def on_send(node)
+            node_role_include?(node) do |val|
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, "node.role?(#{val.source})")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,47 +1,47 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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
-        # The Ohai default recipe previously allowed a user to ship custom Ohai plugins to a system by including them in a directory in the Ohai cookbook. This functionality was replaced with the ohai_plugin resource, which should be used instead as it doesn't require forking the ohai cookbook.
-        #
-        # @example
-        #
-        #   # bad
-        #   include_recipe 'ohai::default'
-        #   include_recipe 'ohai'
-        #
-        class IncludingOhaiDefaultRecipe < Base
-          MSG = "Use the ohai_plugin resource to ship custom Ohai plugins instead of using the ohai::default recipe. If you're not shipping custom Ohai plugins, then you can remove this recipe entirely"
-          RESTRICT_ON_SEND = [:include_recipe].freeze
-
-          def_node_matcher :ohai_recipe_usage?, <<-PATTERN
-            (send nil? :include_recipe (str {"ohai" "ohai::default"}))
-          PATTERN
-
-          def on_send(node)
-            ohai_recipe_usage?(node) do
-              add_offense(node, severity: :refactor)
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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
+        # The Ohai default recipe previously allowed a user to ship custom Ohai plugins to a system by including them in a directory in the Ohai cookbook. This functionality was replaced with the ohai_plugin resource, which should be used instead as it doesn't require forking the ohai cookbook.
+        #
+        # @example
+        #
+        #   # bad
+        #   include_recipe 'ohai::default'
+        #   include_recipe 'ohai'
+        #
+        class IncludingOhaiDefaultRecipe < Base
+          MSG = "Use the ohai_plugin resource to ship custom Ohai plugins instead of using the ohai::default recipe. If you're not shipping custom Ohai plugins, then you can remove this recipe entirely"
+          RESTRICT_ON_SEND = [:include_recipe].freeze
+
+          def_node_matcher :ohai_recipe_usage?, <<-PATTERN
+            (send nil? :include_recipe (str {"ohai" "ohai::default"}))
+          PATTERN
+
+          def on_send(node)
+            ohai_recipe_usage?(node) do
+              add_offense(node, severity: :refactor)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,54 +1,54 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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
-        # The openssl_rsa_key resource was renamed to openssl_rsa_private_key in Chef Infra Client 14.0. The new resource name should be used.
-        #
-        # @example
-        #
-        #   # bad
-        #   openssl_rsa_key '/etc/httpd/ssl/server.key' do
-        #     key_length 2048
-        #   end
-        #
-        #   # good
-        #   openssl_rsa_private_key '/etc/httpd/ssl/server.key' do
-        #     key_length 2048
-        #   end
-        #
-        class OpensslRsaKeyResource < Base
-          extend TargetChefVersion
-          extend AutoCorrector
-
-          minimum_target_chef_version '14.0'
-
-          MSG = 'The openssl_rsa_key resource was renamed to openssl_rsa_private_key in Chef Infra Client 14.0. The new resource name should be used.'
-          RESTRICT_ON_SEND = [:openssl_rsa_key].freeze
-
-          def on_send(node)
-            add_offense(node, severity: :refactor) do |corrector|
-              corrector.replace(node, node.source.gsub(/^openssl_rsa_key/, 'openssl_rsa_private_key'))
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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
+        # The openssl_rsa_key resource was renamed to openssl_rsa_private_key in Chef Infra Client 14.0. The new resource name should be used.
+        #
+        # @example
+        #
+        #   # bad
+        #   openssl_rsa_key '/etc/httpd/ssl/server.key' do
+        #     key_length 2048
+        #   end
+        #
+        #   # good
+        #   openssl_rsa_private_key '/etc/httpd/ssl/server.key' do
+        #     key_length 2048
+        #   end
+        #
+        class OpensslRsaKeyResource < Base
+          extend TargetChefVersion
+          extend AutoCorrector
+
+          minimum_target_chef_version '14.0'
+
+          MSG = 'The openssl_rsa_key resource was renamed to openssl_rsa_private_key in Chef Infra Client 14.0. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:openssl_rsa_key].freeze
+
+          def on_send(node)
+            add_offense(node, severity: :refactor) do |corrector|
+              corrector.replace(node, node.source.gsub(/^openssl_rsa_key/, 'openssl_rsa_private_key'))
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,60 +1,60 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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
-        # The openssl_x509 resource was renamed to openssl_x509_certificate in Chef Infra Client 14.4. The new resource name should be used.
-        #
-        # @example
-        #
-        #   # bad
-        #   openssl_x509 '/etc/httpd/ssl/mycert.pem' do
-        #     common_name 'www.f00bar.com'
-        #     org 'Foo Bar'
-        #     org_unit 'Lab'
-        #     country 'US'
-        #   end
-        #
-        #   # good
-        #   openssl_x509_certificate '/etc/httpd/ssl/mycert.pem' do
-        #     common_name 'www.f00bar.com'
-        #     org 'Foo Bar'
-        #     org_unit 'Lab'
-        #     country 'US'
-        #   end
-        #
-        class OpensslX509Resource < Base
-          extend TargetChefVersion
-          extend AutoCorrector
-
-          minimum_target_chef_version '14.4'
-
-          MSG = 'The openssl_x509 resource was renamed to openssl_x509_certificate in Chef Infra Client 14.4. The new resource name should be used.'
-          RESTRICT_ON_SEND = [:openssl_x509].freeze
-
-          def on_send(node)
-            add_offense(node, severity: :refactor) do |corrector|
-              corrector.replace(node, node.source.gsub(/^openssl_x509/, 'openssl_x509_certificate'))
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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
+        # The openssl_x509 resource was renamed to openssl_x509_certificate in Chef Infra Client 14.4. The new resource name should be used.
+        #
+        # @example
+        #
+        #   # bad
+        #   openssl_x509 '/etc/httpd/ssl/mycert.pem' do
+        #     common_name 'www.f00bar.com'
+        #     org 'Foo Bar'
+        #     org_unit 'Lab'
+        #     country 'US'
+        #   end
+        #
+        #   # good
+        #   openssl_x509_certificate '/etc/httpd/ssl/mycert.pem' do
+        #     common_name 'www.f00bar.com'
+        #     org 'Foo Bar'
+        #     org_unit 'Lab'
+        #     country 'US'
+        #   end
+        #
+        class OpensslX509Resource < Base
+          extend TargetChefVersion
+          extend AutoCorrector
+
+          minimum_target_chef_version '14.4'
+
+          MSG = 'The openssl_x509 resource was renamed to openssl_x509_certificate in Chef Infra Client 14.4. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:openssl_x509].freeze
+
+          def on_send(node)
+            add_offense(node, severity: :refactor) do |corrector|
+              corrector.replace(node, node.source.gsub(/^openssl_x509/, 'openssl_x509_certificate'))
+            end
+          end
+        end
+      end
+    end
+  end
+end