fix: switch linting from cookstyle to chefstyle

Update Rakefile to use 'cookstyle --chefstyle' instead of
RuboCop::RakeTask with the unsupported --chefstyle flag. The
--chefstyle flag is handled by the cookstyle binary, not by RuboCop
directly.

Remove the require directive from .rubocop.yml since --chefstyle
handles config loading internally.

Auto-correct all chefstyle offenses (double-quoted strings,
%i{} delimiters).

Signed-off-by: Lance Albertson <lance@osuosl.org>

Author: ramereth

.rubocop.yml

@@ -1,7 +1,4 @@
 ---
-require:
-  - cookstyle
-
 AllCops:
   TargetRubyVersion: 3.1
   Include:

Rakefile

@@ -16,9 +16,9 @@ end
 
 begin
   require 'cookstyle'
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new(:style) do |task|
-    task.options += ['--display-cop-names', '--no-color']
+  desc 'Run cookstyle with chefstyle rules'
+  task :style do
+    sh 'cookstyle --chefstyle --display-cop-names'
   end
 rescue LoadError
   puts 'cookstyle is not available.  gem install cookstyle to do style checking.'

lib/kitchen/driver/openstack.rb

@@ -21,15 +21,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'kitchen'
-require 'fog/openstack'
-require 'yaml'
-require_relative 'openstack_version'
-require_relative 'openstack/config'
-require_relative 'openstack/helpers'
-require_relative 'openstack/networking'
-require_relative 'openstack/server_helper'
-require_relative 'openstack/volume'
+require "kitchen"
+require "fog/openstack"
+require "yaml"
+require_relative "openstack_version"
+require_relative "openstack/config"
+require_relative "openstack/helpers"
+require_relative "openstack/networking"
+require_relative "openstack/server_helper"
+require_relative "openstack/volume"
 
 module Kitchen
   module Driver
@@ -46,7 +46,7 @@ class Openstack < Kitchen::Driver::Base
       default_config :server_name, nil
       default_config :server_name_prefix, nil
       default_config :key_name, nil
-      default_config :port, '22'
+      default_config :port, "22"
       default_config :use_ipv6, false
       default_config :openstack_project_name, nil
       default_config :openstack_region, nil
@@ -110,13 +110,13 @@ def destroy(state)
 
         unless server.nil?
           if config[:floating_ip_pool] && config[:allocate_floating_ip]
-            info 'Retrieve the floating IP'
+            info "Retrieve the floating IP"
             pub, priv = get_public_private_ips(server)
             pub, = parse_ips(pub, priv)
             pub_ip = pub[config[:public_ip_order].to_i] || nil
             if pub_ip
               info "Retrieve the ID of floating IP <#{pub_ip}>"
-              floating_ip_id = network.list_floating_ips(floating_ip_address: pub_ip).body['floatingips'][0]['id']
+              floating_ip_id = network.list_floating_ips(floating_ip_address: pub_ip).body["floatingips"][0]["id"]
               network.delete_floating_ip(floating_ip_id)
               info "OpenStack Floating IP <#{pub_ip}> released."
             end
@@ -141,17 +141,17 @@ def openstack_server
       end
 
       def required_server_settings
-        %i(openstack_username openstack_api_key openstack_auth_url openstack_domain_id)
+        %i{openstack_username openstack_api_key openstack_auth_url openstack_domain_id}
       end
 
       def optional_server_settings
         Fog::OpenStack::Compute.recognized.select do |k|
-          k.to_s.start_with?('openstack')
+          k.to_s.start_with?("openstack")
         end - required_server_settings
       end
 
       def connection_options
-        %i(read_timeout write_timeout connect_timeout)
+        %i{read_timeout write_timeout connect_timeout}
       end
 
       def network

lib/kitchen/driver/openstack/config.rb

@@ -49,11 +49,11 @@ def config_server_name
         # Total:        63
         def default_name
           [
-            instance.name.gsub(/\W/, '')[0..14],
-            ((Etc.getpwuid ? Etc.getpwuid.name : Etc.getlogin) || 'nologin').gsub(/\W/, '')[0..14],
-            Socket.gethostname.gsub(/\W/, '')[0..22],
+            instance.name.gsub(/\W/, "")[0..14],
+            ((Etc.getpwuid ? Etc.getpwuid.name : Etc.getlogin) || "nologin").gsub(/\W/, "")[0..14],
+            Socket.gethostname.gsub(/\W/, "")[0..22],
             Array.new(7) { rand(36).to_s(36) }.join,
-          ].join('-')
+          ].join("-")
         end
 
         def server_name_prefix(server_name_prefix)
@@ -67,18 +67,18 @@ def server_name_prefix(server_name_prefix)
           # Max:              63
           #
           if server_name_prefix.length > 54
-            warn 'Server name prefix too long, truncated to 54 characters'
+            warn "Server name prefix too long, truncated to 54 characters"
             server_name_prefix = server_name_prefix[0..53]
           end
 
-          server_name_prefix.gsub!(/\W/, '')
+          server_name_prefix.gsub!(/\W/, "")
 
           if server_name_prefix.empty?
-            warn 'Server name prefix empty or invalid; using fully generated name'
+            warn "Server name prefix empty or invalid; using fully generated name"
             default_name
           else
-            random_suffix = ('a'..'z').to_a.sample(8).join
-            server_name_prefix + '-' + random_suffix
+            random_suffix = ("a".."z").to_a.sample(8).join
+            server_name_prefix + "-" + random_suffix
           end
         end
       end

lib/kitchen/driver/openstack/helpers.rb

@@ -21,7 +21,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai' unless defined?(Ohai::System)
+require "ohai" unless defined?(Ohai::System)
 
 module Kitchen
   module Driver
@@ -32,14 +32,14 @@ module Helpers
 
         def add_ohai_hint(state)
           if bourne_shell?
-            info 'Adding OpenStack hint for ohai'
+            info "Adding OpenStack hint for ohai"
             mkdir_cmd = "sudo mkdir -p #{hints_path}"
             touch_cmd = "sudo bash -c 'echo {} > #{hints_path}/openstack.json'"
             instance.transport.connection(state).execute(
               "#{mkdir_cmd} && #{touch_cmd}"
             )
           elsif windows_os?
-            info 'Adding OpenStack hint for ohai'
+            info "Adding OpenStack hint for ohai"
             touch_cmd = "New-Item #{hints_path}\\openstack.json"
             touch_cmd_args = "-Value '{}' -Force -Type file"
             instance.transport.connection(state).execute(
@@ -53,7 +53,7 @@ def hints_path
         end
 
         def disable_ssl_validation
-          require 'excon' unless defined?(Excon)
+          require "excon" unless defined?(Excon)
           Excon.defaults[:ssl_verify_peer] = false
         end
 
@@ -62,7 +62,7 @@ def wait_for_server(state)
             info "Sleeping for #{config[:server_wait]} seconds to let your server start up..."
             countdown(config[:server_wait])
           end
-          info 'Waiting for server to be ready...'
+          info "Waiting for server to be ready..."
           instance.transport.connection(state).wait_until_ready
         rescue
           error "Server #{state[:hostname]} (#{state[:server_id]}) not reachable. Destroying server..."
@@ -73,7 +73,7 @@ def wait_for_server(state)
         def countdown(seconds)
           date1 = Time.now + seconds
           while Time.now < date1
-            Kernel.print '.'
+            Kernel.print "."
             sleep 10
           end
         end

lib/kitchen/driver/openstack/networking.rb

@@ -21,7 +21,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ipaddr' unless defined?(IPAddr)
+require "ipaddr" unless defined?(IPAddr)
 
 module Kitchen
   module Driver
@@ -37,11 +37,11 @@ def attach_ip_from_pool(server, pool)
             info "Attaching floating IP from <#{pool}> pool"
             if config[:allocate_floating_ip]
               network_id = network
-                           .list_networks(
+                .list_networks(
                   name: pool
-                ).body['networks'][0]['id']
+                ).body["networks"][0]["id"]
               resp = network.create_floating_ip(network_id)
-              ip = resp.body['floatingip']['floating_ip_address']
+              ip = resp.body["floatingip"]["floating_ip_address"]
               info "Created floating IP <#{ip}> from <#{pool}> pool"
               config[:floating_ip] = ip
             else
@@ -70,8 +70,8 @@ def get_public_private_ips(server)
           rescue Fog::OpenStack::Compute::NotFound, Excon::Errors::Forbidden
             # See Fog issue: https://github.com/fog/fog/issues/2160
             addrs = server.addresses
-            addrs['public'] && pub = addrs['public'].map { |i| i['addr'] }
-            addrs['private'] && priv = addrs['private'].map { |i| i['addr'] }
+            addrs["public"] && pub = addrs["public"].map { |i| i["addr"] }
+            addrs["private"] && priv = addrs["private"].map { |i| i["addr"] }
           end
           [pub, priv]
         end
@@ -83,33 +83,33 @@ def get_ip(server)
           end
 
           # make sure we have the latest info
-          info 'Waiting for network information to be available...'
+          info "Waiting for network information to be available..."
           begin
             w = server.wait_for { !addresses.empty? }
             debug "Waited #{w[:duration]} seconds for network information."
           rescue Fog::Errors::TimeoutError
-            raise ActionFailed, 'Could not get network information (timed out)'
+            raise ActionFailed, "Could not get network information (timed out)"
           end
 
           # should also work for private networks
           if config[:openstack_network_name]
             debug "Using configured net: #{config[:openstack_network_name]}"
-            return filter_ips(server.addresses[config[:openstack_network_name]]).first['addr']
+            return filter_ips(server.addresses[config[:openstack_network_name]]).first["addr"]
           end
 
           pub, priv = get_public_private_ips(server)
           priv = server.ip_addresses if Array(pub).empty? && Array(priv).empty?
           pub, priv = parse_ips(pub, priv)
           pub[config[:public_ip_order].to_i] ||
             priv[config[:private_ip_order].to_i] ||
-            raise(ActionFailed, 'Could not find an IP')
+            raise(ActionFailed, "Could not find an IP")
         end
 
         def filter_ips(addresses)
           if config[:use_ipv6]
-            addresses.select { |i| IPAddr.new(i['addr']).ipv6? }
+            addresses.select { |i| IPAddr.new(i["addr"]).ipv6? }
           else
-            addresses.select { |i| IPAddr.new(i['addr']).ipv4? }
+            addresses.select { |i| IPAddr.new(i["addr"]).ipv4? }
           end
         end
 

lib/kitchen/driver/openstack/server_helper.rb

@@ -30,36 +30,36 @@ module ServerHelper
 
         def create_server
           server_def = init_configuration
-          raise(ActionFailed, 'Cannot specify both network_ref and network_id') if config[:network_id] && config[:network_ref]
+          raise(ActionFailed, "Cannot specify both network_ref and network_id") if config[:network_id] && config[:network_ref]
 
           if config[:network_id]
             networks = [].push(config[:network_id])
             server_def[:nics] = networks.flatten.map do |net_id|
-              { 'net_id' => net_id }
+              { "net_id" => net_id }
             end
           elsif config[:network_ref]
             networks = [].push(config[:network_ref])
             server_def[:nics] = networks.flatten.map do |net|
-              { 'net_id' => find_network(net).id }
+              { "net_id" => find_network(net).id }
             end
           end
 
           if config[:block_device_mapping]
             server_def[:block_device_mapping] = get_bdm(config)
           end
 
-          %i(
+          %i{
             security_groups
             key_name
             user_data
             config_drive
             metadata
-          ).each do |c|
+          }.each do |c|
             server_def[c] = optional_config(c) if config[c]
           end
 
           if config[:cloud_config]
-            raise(ActionFailed, 'Cannot specify both cloud_config and user_data') if config[:user_data]
+            raise(ActionFailed, "Cannot specify both cloud_config and user_data") if config[:user_data]
 
             server_def[:user_data] = YAML.dump(Kitchen::Util.stringified_hash(config[:cloud_config])).gsub(/^---\n/, "#cloud-config\n")
           end
@@ -71,8 +71,8 @@ def create_server
         end
 
         def init_configuration
-          raise(ActionFailed, 'Cannot specify both image_ref and image_id') if config[:image_id] && config[:image_ref]
-          raise(ActionFailed, 'Cannot specify both flavor_ref and flavor_id') if config[:flavor_id] && config[:flavor_ref]
+          raise(ActionFailed, "Cannot specify both image_ref and image_id") if config[:image_id] && config[:image_ref]
+          raise(ActionFailed, "Cannot specify both flavor_ref and flavor_id") if config[:flavor_id] && config[:flavor_ref]
 
           {
             name: config[:server_name],
@@ -95,31 +95,31 @@ def optional_config(c)
 
         def find_image(image_ref)
           image = find_matching(compute.images, image_ref)
-          raise(ActionFailed, 'Image not found') unless image
+          raise(ActionFailed, "Image not found") unless image
 
           debug "Selected image: #{image.id} #{image.name}"
           image
         end
 
         def find_flavor(flavor_ref)
           flavor = find_matching(compute.flavors, flavor_ref)
-          raise(ActionFailed, 'Flavor not found') unless flavor
+          raise(ActionFailed, "Flavor not found") unless flavor
 
           debug "Selected flavor: #{flavor.id} #{flavor.name}"
           flavor
         end
 
         def find_network(network_ref)
           net = find_matching(network.networks.all, network_ref)
-          raise(ActionFailed, 'Network not found') unless net
+          raise(ActionFailed, "Network not found") unless net
 
           debug "Selected net: #{net.id} #{net.name}"
           net
         end
 
         def find_matching(collection, name)
           name = name.to_s
-          if name.start_with?('/') && name.end_with?('/')
+          if name.start_with?("/") && name.end_with?("/")
             regex = Regexp.new(name[1...-1])
             # check for regex name match
             collection.each { |single| return single if regex&.match?(single.name) }