Use ||= instead of unless defined? for constantsavoid_warning

This is a lot easier to read.

Signed-off-by: Tim Smith <tsmith@chef.io>

10 files changed, 23 insertions, 27 deletions

diff --git a/lib/ohai/mixin/azure_metadata.rb b/lib/ohai/mixin/azure_metadata.rb
index 783ef8a9..5e924b4b 100644
--- a/lib/ohai/mixin/azure_metadata.rb
+++ b/lib/ohai/mixin/azure_metadata.rb
@@ -21,8 +21,8 @@ module Ohai
   module Mixin
     module AzureMetadata
 
-      AZURE_METADATA_ADDR = "169.254.169.254".freeze unless defined?(AZURE_METADATA_ADDR)
-      AZURE_METADATA_URL = "/metadata/instance?api-version=2017-08-01".freeze unless defined?(AZURE_METADATA_URL)
+      AZURE_METADATA_ADDR ||= "169.254.169.254".freeze
+      AZURE_METADATA_URL ||= "/metadata/instance?api-version=2017-08-01".freeze
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)
diff --git a/lib/ohai/mixin/do_metadata.rb b/lib/ohai/mixin/do_metadata.rb
index 10d850ca..b23d2b58 100644
--- a/lib/ohai/mixin/do_metadata.rb
+++ b/lib/ohai/mixin/do_metadata.rb
@@ -20,8 +20,8 @@ module Ohai
   module Mixin
     module DOMetadata
 
-      DO_METADATA_ADDR = "169.254.169.254".freeze unless defined?(DO_METADATA_ADDR)
-      DO_METADATA_URL = "/metadata/v1.json".freeze unless defined?(DO_METADATA_URL)
+      DO_METADATA_ADDR ||= "169.254.169.254".freeze
+      DO_METADATA_URL ||= "/metadata/v1.json".freeze
 
       def http_client
         Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }
diff --git a/lib/ohai/mixin/ec2_metadata.rb b/lib/ohai/mixin/ec2_metadata.rb
index d050c473..4a8a655f 100644
--- a/lib/ohai/mixin/ec2_metadata.rb
+++ b/lib/ohai/mixin/ec2_metadata.rb
@@ -39,13 +39,13 @@ module Ohai
     #
     module Ec2Metadata
 
-      EC2_METADATA_ADDR = "169.254.169.254".freeze unless defined?(EC2_METADATA_ADDR)
-      EC2_SUPPORTED_VERSIONS = %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
+      EC2_METADATA_ADDR ||= "169.254.169.254".freeze
+      EC2_SUPPORTED_VERSIONS ||= %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
                                    2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
                                    2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02 }.freeze
-      EC2_ARRAY_VALUES = %w{security-groups local_ipv4s}.freeze
-      EC2_ARRAY_DIR    = %w{network/interfaces/macs}.freeze
-      EC2_JSON_DIR     = %w{iam}.freeze
+      EC2_ARRAY_VALUES ||= %w{security-groups local_ipv4s}.freeze
+      EC2_ARRAY_DIR    ||= %w{network/interfaces/macs}.freeze
+      EC2_JSON_DIR     ||= %w{iam}.freeze
 
       def best_api_version
         @api_version ||= begin
diff --git a/lib/ohai/mixin/gce_metadata.rb b/lib/ohai/mixin/gce_metadata.rb
index 6200cab6..56c0fb5f 100644
--- a/lib/ohai/mixin/gce_metadata.rb
+++ b/lib/ohai/mixin/gce_metadata.rb
@@ -21,8 +21,8 @@ module Ohai
     module GCEMetadata
 
       # Trailing dot to host is added to avoid DNS search path
-      GCE_METADATA_ADDR = "metadata.google.internal.".freeze unless defined?(GCE_METADATA_ADDR)
-      GCE_METADATA_URL = "/computeMetadata/v1/?recursive=true".freeze unless defined?(GCE_METADATA_URL)
+      GCE_METADATA_ADDR ||= "metadata.google.internal.".freeze
+      GCE_METADATA_URL ||= "/computeMetadata/v1/?recursive=true".freeze
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)
diff --git a/lib/ohai/mixin/scaleway_metadata.rb b/lib/ohai/mixin/scaleway_metadata.rb
index ab88559f..9b09f7d4 100644
--- a/lib/ohai/mixin/scaleway_metadata.rb
+++ b/lib/ohai/mixin/scaleway_metadata.rb
@@ -20,8 +20,8 @@ module Ohai
   module Mixin
     module ScalewayMetadata
 
-      SCALEWAY_METADATA_ADDR = "169.254.42.42".freeze unless defined?(SCALEWAY_METADATA_ADDR)
-      SCALEWAY_METADATA_URL = "/conf?format=json".freeze unless defined?(SCALEWAY_METADATA_URL)
+      SCALEWAY_METADATA_ADDR ||= "169.254.42.42".freeze
+      SCALEWAY_METADATA_URL ||= "/conf?format=json".freeze
 
       # @return [Net::HTTP] net/http object without timeout set to 6
       def http_client
diff --git a/lib/ohai/mixin/softlayer_metadata.rb b/lib/ohai/mixin/softlayer_metadata.rb
index d2270380..6eb7813b 100644
--- a/lib/ohai/mixin/softlayer_metadata.rb
+++ b/lib/ohai/mixin/softlayer_metadata.rb
@@ -22,7 +22,7 @@ require "uri" unless defined?(URI)
 
 # https://softlayer.github.io/reference/services/SoftLayer_Resource_Metadata/
 module ::Ohai::Mixin::SoftlayerMetadata
-  SOFTLAYER_API_QUERY_URL = "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata".freeze unless defined?(SOFTLAYER_API_QUERY_URL)
+  SOFTLAYER_API_QUERY_URL ||= "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata".freeze
 
   # fetch metadata items and build out hash of data
   #
diff --git a/lib/ohai/plugins/linux/network.rb b/lib/ohai/plugins/linux/network.rb
index a0fca04d..5f0847b4 100644
--- a/lib/ohai/plugins/linux/network.rb
+++ b/lib/ohai/plugins/linux/network.rb
@@ -491,7 +491,7 @@ Ohai.plugin(:Network) do
     # Match the lead line for an interface from iproute2
     # 3: eth0.11@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
-    IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/.freeze unless defined? IPROUTE_INT_REGEX
+    IPROUTE_INT_REGEX ||= /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/.freeze
 
     if which("ip")
       # families to get default routes from
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb
index b170a738..61e9c81c 100644
--- a/lib/ohai/plugins/linux/platform.rb
+++ b/lib/ohai/plugins/linux/platform.rb
@@ -23,8 +23,7 @@ Ohai.plugin(:Platform) do
   # the platform mappings between the 'ID' field in /etc/os-release and the value
   # ohai uses. If you're adding a new platform here and you want to change the name
   # you'll want to add it here and then add a spec for the platform_id_remap method
-  unless defined?(PLATFORM_MAPPINGS)
-    PLATFORM_MAPPINGS = {
+  PLATFORM_MAPPINGS ||= {
       "rhel" => "redhat",
       "amzn" => "amazon",
       "ol" => "oracle",
@@ -34,7 +33,6 @@ Ohai.plugin(:Platform) do
       "xenenterprise" => "xenserver",
       "cumulus-linux" => "cumulus",
     }.freeze
-  end
 
   # @deprecated
   def get_redhatish_platform(contents)
diff --git a/lib/ohai/plugins/packages.rb b/lib/ohai/plugins/packages.rb
index 56ab252b..796efee0 100644
--- a/lib/ohai/plugins/packages.rb
+++ b/lib/ohai/plugins/packages.rb
@@ -22,13 +22,11 @@ Ohai.plugin(:Packages) do
   provides "packages"
   depends "platform_family"
 
-  unless defined?(WINDOWS_ATTRIBUTE_ALIASES)
-    WINDOWS_ATTRIBUTE_ALIASES = {
-      "DisplayVersion" => "version",
-      "Publisher" => "publisher",
-      "InstallDate" => "installdate",
-    }.freeze
-  end
+  WINDOWS_ATTRIBUTE_ALIASES ||= {
+    "DisplayVersion" => "version",
+    "Publisher" => "publisher",
+    "InstallDate" => "installdate",
+  }.freeze
 
   collect_data(:linux) do
     packages Mash.new
diff --git a/lib/ohai/plugins/windows/filesystem.rb b/lib/ohai/plugins/windows/filesystem.rb
index db7e9119..e637cf54 100644
--- a/lib/ohai/plugins/windows/filesystem.rb
+++ b/lib/ohai/plugins/windows/filesystem.rb
@@ -23,8 +23,8 @@ Ohai.plugin(:Filesystem) do
   #
   # @see https://docs.microsoft.com/en-us/windows/desktop/SecProv/getconversionstatus-win32-encryptablevolume#parameters
   #
-  CONVERSION_STATUS = %w{FullyDecrypted FullyEncrypted EncryptionInProgress
-                         DecryptionInProgress EncryptionPaused DecryptionPaused}.freeze unless defined?(CONVERSION_STATUS)
+  CONVERSION_STATUS ||= %w{FullyDecrypted FullyEncrypted EncryptionInProgress
+                         DecryptionInProgress EncryptionPaused DecryptionPaused}.freeze
 
   # Returns a Mash loaded with logical details
   #