From f22a84f26f62639c205ebf977e8aee5f180fdecd Mon Sep 17 00:00:00 2001 From: Brandon High Date: Thu, 5 Mar 2020 11:16:43 -0800 Subject: [PATCH] "Unsafe" rubocop fixes Adds the remaining "unsafe" fixes that aren't included in #359 --- bin/vmpooler | 1 + lib/vmpooler.rb | 6 ++++-- lib/vmpooler/api.rb | 2 ++ lib/vmpooler/api/dashboard.rb | 2 ++ lib/vmpooler/api/helpers.rb | 2 ++ lib/vmpooler/api/reroute.rb | 2 ++ lib/vmpooler/api/v1.rb | 4 +++- lib/vmpooler/dashboard.rb | 2 ++ lib/vmpooler/dummy_statsd.rb | 2 ++ lib/vmpooler/generic_connection_pool.rb | 2 ++ lib/vmpooler/graphite.rb | 2 ++ lib/vmpooler/logger.rb | 2 ++ lib/vmpooler/pool_manager.rb | 4 +++- lib/vmpooler/providers.rb | 4 +++- lib/vmpooler/providers/base.rb | 2 ++ lib/vmpooler/providers/dummy.rb | 2 ++ lib/vmpooler/providers/vsphere.rb | 8 +++++--- lib/vmpooler/statsd.rb | 2 ++ lib/vmpooler/version.rb | 4 +++- 19 files changed, 46 insertions(+), 9 deletions(-) diff --git a/bin/vmpooler b/bin/vmpooler index b84a139..bdf6d9a 100755 --- a/bin/vmpooler +++ b/bin/vmpooler @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require 'vmpooler' diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb index ddc1582..40332a5 100644 --- a/lib/vmpooler.rb +++ b/lib/vmpooler.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler require 'date' require 'json' @@ -41,7 +43,7 @@ module Vmpooler # Bail out if someone attempts to start vmpooler with dummy authentication # without enbaling debug mode. - if parsed_config.has_key? :auth + if parsed_config.key? :auth if parsed_config[:auth]['provider'] == 'dummy' unless ENV['VMPOOLER_DEBUG'] warning = [ @@ -94,7 +96,7 @@ module Vmpooler parsed_config[:graphite]['port'] = string_to_int(ENV['GRAPHITE_PORT']) if ENV['GRAPHITE_PORT'] parsed_config[:auth] = parsed_config[:auth] || {} if ENV['AUTH_PROVIDER'] - if parsed_config.has_key? :auth + if parsed_config.key? :auth parsed_config[:auth]['provider'] = ENV['AUTH_PROVIDER'] if ENV['AUTH_PROVIDER'] parsed_config[:auth][:ldap] = parsed_config[:auth][:ldap] || {} if parsed_config[:auth]['provider'] == 'ldap' parsed_config[:auth][:ldap]['host'] = ENV['LDAP_HOST'] if ENV['LDAP_HOST'] diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb index 22bf64e..cf7e8ab 100644 --- a/lib/vmpooler/api.rb +++ b/lib/vmpooler/api.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class API < Sinatra::Base def initialize diff --git a/lib/vmpooler/api/dashboard.rb b/lib/vmpooler/api/dashboard.rb index 2288b79..9d3ba00 100644 --- a/lib/vmpooler/api/dashboard.rb +++ b/lib/vmpooler/api/dashboard.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class API class Dashboard < Sinatra::Base diff --git a/lib/vmpooler/api/helpers.rb b/lib/vmpooler/api/helpers.rb index 6fdd2f6..539d51c 100644 --- a/lib/vmpooler/api/helpers.rb +++ b/lib/vmpooler/api/helpers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class API diff --git a/lib/vmpooler/api/reroute.rb b/lib/vmpooler/api/reroute.rb index 9c68663..bc44106 100644 --- a/lib/vmpooler/api/reroute.rb +++ b/lib/vmpooler/api/reroute.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class API class Reroute < Sinatra::Base diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index 17e3710..b969d6f 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class API class V1 < Sinatra::Base @@ -936,7 +938,7 @@ module Vmpooler end end - if failure.size > 0 + if !failure.empty? status 400 result['failure'] = failure else diff --git a/lib/vmpooler/dashboard.rb b/lib/vmpooler/dashboard.rb index b875465..6359127 100644 --- a/lib/vmpooler/dashboard.rb +++ b/lib/vmpooler/dashboard.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class Dashboard < Sinatra::Base diff --git a/lib/vmpooler/dummy_statsd.rb b/lib/vmpooler/dummy_statsd.rb index a555268..fa23833 100644 --- a/lib/vmpooler/dummy_statsd.rb +++ b/lib/vmpooler/dummy_statsd.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class DummyStatsd attr_reader :server, :port, :prefix diff --git a/lib/vmpooler/generic_connection_pool.rb b/lib/vmpooler/generic_connection_pool.rb index ca18576..6c74783 100644 --- a/lib/vmpooler/generic_connection_pool.rb +++ b/lib/vmpooler/generic_connection_pool.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'connection_pool' module Vmpooler diff --git a/lib/vmpooler/graphite.rb b/lib/vmpooler/graphite.rb index e7f28c3..7261511 100644 --- a/lib/vmpooler/graphite.rb +++ b/lib/vmpooler/graphite.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rubygems' unless defined?(Gem) module Vmpooler diff --git a/lib/vmpooler/logger.rb b/lib/vmpooler/logger.rb index f481246..f8a9644 100644 --- a/lib/vmpooler/logger.rb +++ b/lib/vmpooler/logger.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rubygems' unless defined?(Gem) module Vmpooler diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 37063de..c361c41 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'vmpooler/providers' require 'spicy-proton' @@ -54,7 +56,7 @@ module Vmpooler pool_keys.each do |k| to_set[k] = pool[k] end - to_set['alias'] = pool['alias'].join(',') if to_set.has_key?('alias') + to_set['alias'] = pool['alias'].join(',') if to_set.key?('alias') $redis.hmset("vmpooler__pool__#{pool['name']}", to_set.to_a.flatten) unless to_set.empty? end previously_configured_pools.each do |pool| diff --git a/lib/vmpooler/providers.rb b/lib/vmpooler/providers.rb index 9a5d955..7da9d13 100644 --- a/lib/vmpooler/providers.rb +++ b/lib/vmpooler/providers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'pathname' module Vmpooler @@ -38,7 +40,7 @@ module Vmpooler # we don't exactly know if the provider name matches the main file name that should be loaded # so we use globs to get everything like the name # this could mean that vsphere5 and vsphere6 are loaded when only vsphere5 is used - Dir.glob(File.join(gem_path, "*#{name}*.rb")).each do |file| + Dir.glob(File.join(gem_path, "*#{name}*.rb")).sort.each do |file| require file end end diff --git a/lib/vmpooler/providers/base.rb b/lib/vmpooler/providers/base.rb index d30564f..fa730bf 100644 --- a/lib/vmpooler/providers/base.rb +++ b/lib/vmpooler/providers/base.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler class PoolManager class Provider diff --git a/lib/vmpooler/providers/dummy.rb b/lib/vmpooler/providers/dummy.rb index bc924a0..b221859 100644 --- a/lib/vmpooler/providers/dummy.rb +++ b/lib/vmpooler/providers/dummy.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'yaml' require 'vmpooler/providers/base' diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb index 2ffe409..71b6659 100644 --- a/lib/vmpooler/providers/vsphere.rb +++ b/lib/vmpooler/providers/vsphere.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'vmpooler/providers/base' module Vmpooler @@ -481,9 +483,9 @@ module Vmpooler end # vSphere helper methods - ADAPTER_TYPE = 'lsiLogic'.freeze - DISK_TYPE = 'thin'.freeze - DISK_MODE = 'persistent'.freeze + ADAPTER_TYPE = 'lsiLogic' + DISK_TYPE = 'thin' + DISK_MODE = 'persistent' def ensured_vsphere_connection(connection_pool_object) connection_pool_object[:connection] = connect_to_vsphere unless vsphere_connection_ok?(connection_pool_object[:connection]) diff --git a/lib/vmpooler/statsd.rb b/lib/vmpooler/statsd.rb index 141649f..4843bec 100644 --- a/lib/vmpooler/statsd.rb +++ b/lib/vmpooler/statsd.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rubygems' unless defined?(Gem) require 'statsd' diff --git a/lib/vmpooler/version.rb b/lib/vmpooler/version.rb index 2b2306c..fb27c85 100644 --- a/lib/vmpooler/version.rb +++ b/lib/vmpooler/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Vmpooler - VERSION = '0.10.3'.freeze + VERSION = '0.10.3' end