Move POptionalType handling close to where it is used

puppetlabs · May 22, 2018 · c42df5e · c42df5e
1 parent 62222e1
commit c42df5e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/puppet/resource_api.rb b/lib/puppet/resource_api.rb
@@ -210,16 +210,16 @@ def insync?(is)
             end
           end
 
-          if type.instance_of? Puppet::Pops::Types::POptionalType
-            type = type.type
-          end
-
           # puppet symbolizes some values through puppet/parameter/value.rb (see .convert()), but (especially) Enums
           # are strings. specifying a munge block here skips the value_collection fallback in puppet/parameter.rb's
           # default .unsafe_munge() implementation.
           munge { |v| v }
 
           # provide hints to `puppet type generate` for better parsing
+          if type.instance_of? Puppet::Pops::Types::POptionalType
+            type = type.type
+          end
+
           case type
           when Puppet::Pops::Types::PStringType
             # require any string value