Chefstyle fixes for the latest release

Signed-off-by: Tim Smith <[email protected]>
chef · Apr 29, 2021 · d076258 · d076258
1 parent 1cb17cf
commit d076258
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/knife-google.gemspec b/knife-google.gemspec
@@ -1,4 +1,4 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("lib", __dir__)
 require "knife-google/version"
 
 Gem::Specification.new do |s|

diff --git a/lib/chef/knife/cloud/google_service.rb b/lib/chef/knife/cloud/google_service.rb
@@ -412,8 +412,7 @@ def image_alias_url(image_alias)
 
       latest_image = connection.list_images(image_project).items
         .select { |image| image.name.start_with?(image_prefix) }
-        .sort_by(&:name)
-        .last
+        .max_by(&:name)
 
       return if latest_image.nil?
 

diff --git a/lib/chef/knife/google_server_create.rb b/lib/chef/knife/google_server_create.rb
@@ -225,7 +225,7 @@ def validate_params!
     def before_bootstrap
       super
 
-      config[:chef_node_name] = config[:chef_node_name] ? config[:chef_node_name] : instance_name
+      config[:chef_node_name] = config[:chef_node_name] || instance_name
       config[:bootstrap_ip_address] = ip_address_for_bootstrap
 
       if config[:image_os_type] == "windows"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../lib", __dir__)
 require "chef"
 require "chef/knife"
 require "chef/knife/cloud/google_service_helpers"