(PUP-11767) Fix IdenticalConditionalBranches violations and remove from to_do

Author: tvpartytonight

.rubocop_todo.yml

@@ -504,18 +504,6 @@ Style/GuardClause:
 Style/HashSyntax:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'lib/puppet/functions/filter.rb'
-    - 'lib/puppet/network/http_pool.rb'
-    - 'lib/puppet/node.rb'
-    - 'lib/puppet/parser/resource.rb'
-    - 'lib/puppet/pops/loader/module_loaders.rb'
-    - 'lib/puppet/pops/types/p_type_set_type.rb'
-    - 'lib/puppet/type.rb'
-    - 'lib/puppet/util/feature.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:

lib/puppet/functions/filter.rb

@@ -124,7 +124,6 @@ def filter_Enumerable_2(enumerable)
     if enum.hash_style?
       result = {}
       enum.each { |k, v| result[k] = v if yield(k, v) }
-      result
     else
       result = []
       begin
@@ -133,7 +132,7 @@ def filter_Enumerable_2(enumerable)
         end
       rescue StopIteration
       end
-      result
     end
+    result
   end
 end

lib/puppet/network/http_pool.rb

@@ -36,12 +36,11 @@ def self.http_instance(host, port, use_ssl = true, verify_peer = true)
 
     if verify_peer
       verifier = Puppet::SSL::Verifier.new(host, nil)
-      http_client_class.new(host, port, use_ssl: use_ssl, verifier: verifier)
     else
       ssl = Puppet::SSL::SSLProvider.new
       verifier = Puppet::SSL::Verifier.new(host, ssl.create_insecure_context)
-      http_client_class.new(host, port, use_ssl: use_ssl, verifier: verifier)
     end
+    http_client_class.new(host, port, use_ssl: use_ssl, verifier: verifier)
   end
 
   # Retrieve a connection for the given host and port.

lib/puppet/node.rb

@@ -60,9 +60,7 @@ def serializable_parameters
   end
 
   def environment
-    if @environment
-      @environment
-    else
+    unless @environment
       env = parameters[ENVIRONMENT]
       if env
         self.environment = env
@@ -76,8 +74,8 @@ def environment
         self.environment = Puppet.lookup(:environments).get!(Puppet[:environment])
       end
 
-      @environment
     end
+    @environment
   end
 
   def environment=(env)

lib/puppet/parser/resource.rb

@@ -90,10 +90,9 @@ def evaluate
   def exported=(value)
     if value
       @virtual = true
-      @exported = value
     else
-      @exported = value
     end
+    @exported = value
   end
 
   # Finish the evaluation by assigning defaults and scope tags
@@ -226,10 +225,9 @@ def to_hash
           if value.is_a?(Array)
             value = value.flatten.reject { |v| v.nil? || :undef == v }
           end
-          result[param.name] = value
         else
-          result[param.name] = value
         end
+        result[param.name] = value
       end
     end)
   end

lib/puppet/pops/loader/module_loaders.rb

@@ -410,11 +410,10 @@ def find_existing_path(typed_name)
             # related to origin
             if origin.is_a?(Array)
               origins = origin.filter_map { |ori| existing_path(ori) }
-              return [origins, sp] unless origins.empty?
             else
               origins = candidate_paths(origin)
-              return [origins, sp] unless origins.empty?
             end
+            return [origins, sp] unless origins.empty?
           else
             existing = existing_path(origin)
             return [origin, sp] unless existing.nil?

lib/puppet/pops/types/p_type_set_type.rb

@@ -238,15 +238,13 @@ def defines_type?(t)
   def name_for(t, default_name)
     key = @types.key(t)
     if key.nil?
-      if @references.empty?
-        default_name
-      else
+      unless @references.empty?
         @references.each_pair do |ref_key, ref|
           ref_name = ref.type_set.name_for(t, nil)
           return "#{ref_key}::#{ref_name}" unless ref_name.nil?
         end
-        default_name
       end
+      default_name
     else
       key
     end

lib/puppet/type.rb

@@ -955,9 +955,7 @@ def managed?
     # Once an object is managed, it always stays managed; but an object
     # that is listed as unmanaged might become managed later in the process,
     # so we have to check that every time
-    if @managed
-      return @managed
-    else
+    unless @managed
       @managed = false
       properties.each { |property|
         s = property.should
@@ -966,8 +964,8 @@ def managed?
           break
         end
       }
-      return @managed
     end
+    return @managed
   end
 
   ###############################

lib/puppet/util/feature.rb

@@ -52,13 +52,11 @@ def add(name, options = {}, &block)
       #    * the result was true/false
       #    OR
       #    * we're configured to never retry
-      if @results.has_key?(name) &&
-         (!@results[name].nil? || !Puppet[:always_retry_plugins])
-        !!@results[name]
-      else
+      unless @results.has_key?(name) &&
+             (!@results[name].nil? || !Puppet[:always_retry_plugins])
         @results[name] = test(name, options, &block)
-        !!@results[name]
       end
+      !!@results[name]
     end
   end