Fix wrong data type allocation custom_attributes/extension_requests for csr_attributes

Author: lbetz

REFERENCE.md

@@ -37,11 +37,11 @@ Alias of
 ```puppet
 Struct[{
     Optional['custom_attributes']  => Hash[
-      Openvox_bootstrap::Oid,
+      Variant[Openvox_bootstrap::Oid,Openvox_bootstrap::Cer_short_names],
       String
     ],
     Optional['extension_requests'] => Hash[
-      Variant[Openvox_bootstrap::Oid,Openvox_bootstrap::Cer_short_names],
+      Openvox_bootstrap::Oid,
       String
     ],
   }]

spec/tasks/configure_spec.rb

@@ -133,10 +133,10 @@ def check_returned_id(uid_or_gid)
     let(:csr_attributes) do
       {
         'custom_attributes' => {
-          '1.2.840.113549.1.9.7' => 'bar',
+          'pp_role' => 'spec'
         },
         'extension_requests' => {
-          'pp_role' => 'spec'
+          '1.2.840.113549.1.9.7' => 'bar',
         }
       }
     end
@@ -145,9 +145,9 @@ def check_returned_id(uid_or_gid)
       <<~YAML
         ---
         custom_attributes:
-          1.2.840.113549.1.9.7: bar
-        extension_requests:
           pp_role: spec
+        extension_requests:
+          1.2.840.113549.1.9.7: bar
       YAML
     end
 

types/csr_attributes.pp

@@ -2,11 +2,11 @@
 type Openvox_bootstrap::Csr_attributes = Struct[
   {
     Optional['custom_attributes']  => Hash[
-      Openvox_bootstrap::Oid,
+      Variant[Openvox_bootstrap::Oid,Openvox_bootstrap::Cer_short_names],
       String
     ],
     Optional['extension_requests'] => Hash[
-      Variant[Openvox_bootstrap::Oid,Openvox_bootstrap::Cer_short_names],
+      Openvox_bootstrap::Oid,
       String
     ],
   }