Correctly pass in arguments as a single array

Previously it used << with an array that ended up with a nested array.
Now it correctly uses += resulting in a single flat array.

Fixes: 6e1c856 ("Pass openssl commands as an array")

Author: ekohl

lib/puppet/provider/x509_cert/openssl.rb

@@ -66,14 +66,14 @@ def create
         '-out', resource[:path]
       ]
       if resource[:ca]
-        options << ['-extfile', resource[:template]]
-        options << ['-CAcreateserial']
-        options << ['-CA', resource[:ca]]
-        options << ['-CAkey', resource[:cakey]]
+        options += ['-extfile', resource[:template]]
+        options += ['-CAcreateserial']
+        options += ['-CA', resource[:ca]]
+        options += ['-CAkey', resource[:cakey]]
       else
-        options << ['-signkey', resource[:private_key]]
+        options += ['-signkey', resource[:private_key]]
         if resource[:req_ext]
-          options << [
+          options += [
             '-extensions', 'v3_req',
             '-extfile', resource[:template]
           ]
@@ -92,8 +92,8 @@ def create
 
     password = resource[:cakey_password] || resource[:password]
 
-    options << ['-passin', "pass:#{password}"] if password
-    options << ['-extensions', 'v3_req'] if resource[:req_ext] != :false
+    options += ['-passin', "pass:#{password}"] if password
+    options += ['-extensions', 'v3_req'] if resource[:req_ext] != :false
     openssl options
   end
 

lib/puppet/provider/x509_request/openssl.rb

@@ -35,8 +35,8 @@ def create
       '-out', resource[:path]
     ]
 
-    options << ['-passin', "pass:#{resource[:password]}"] if resource[:password]
-    options << ['-nodes'] unless resource[:encrypted]
+    options += ['-passin', "pass:#{resource[:password]}"] if resource[:password]
+    options += ['-nodes'] unless resource[:encrypted]
 
     openssl options
   end

spec/unit/puppet/provider/x509_cert/openssl_spec.rb

@@ -39,7 +39,7 @@
                                                          '-days', 3650,
                                                          '-key', '/tmp/foo.key',
                                                          '-out', '/tmp/foo.crt',
-                                                         ['-extensions', 'v3_req']
+                                                         '-extensions', 'v3_req',
                                                        ])
       resource.provider.create
     end
@@ -55,8 +55,8 @@
                                                            '-days', 3650,
                                                            '-key', '/tmp/foo.key',
                                                            '-out', '/tmp/foo.crt',
-                                                           ['-passin', 'pass:2x6${'],
-                                                           ['-extensions', 'v3_req']
+                                                           '-passin', 'pass:2x6${',
+                                                           '-extensions', 'v3_req',
                                                          ])
         resource.provider.create
       end
@@ -74,11 +74,11 @@
                                                          '-days', 3650,
                                                          '-in', '/tmp/foo.csr',
                                                          '-out', '/tmp/foo.crt',
-                                                         ['-extfile', '/tmp/foo.cnf'],
-                                                         ['-CAcreateserial'],
-                                                         ['-CA', '/tmp/foo-ca.crt'],
-                                                         ['-CAkey', '/tmp/foo-ca.key'],
-                                                         ['-extensions', 'v3_req']
+                                                         '-extfile', '/tmp/foo.cnf',
+                                                         '-CAcreateserial',
+                                                         '-CA', '/tmp/foo-ca.crt',
+                                                         '-CAkey', '/tmp/foo-ca.key',
+                                                         '-extensions', 'v3_req',
                                                        ])
       resource.provider.create
     end
@@ -96,12 +96,12 @@
                                                          '-days', 3650,
                                                          '-in', '/tmp/foo.csr',
                                                          '-out', '/tmp/foo.crt',
-                                                         ['-extfile', '/tmp/foo.cnf'],
-                                                         ['-CAcreateserial'],
-                                                         ['-CA', '/tmp/foo-ca.crt'],
-                                                         ['-CAkey', '/tmp/foo-ca.key'],
-                                                         ['-passin', 'pass:5i;6%'],
-                                                         ['-extensions', 'v3_req']
+                                                         '-extfile', '/tmp/foo.cnf',
+                                                         '-CAcreateserial',
+                                                         '-CA', '/tmp/foo-ca.crt',
+                                                         '-CAkey', '/tmp/foo-ca.key',
+                                                         '-passin', 'pass:5i;6%',
+                                                         '-extensions', 'v3_req',
                                                        ])
       resource.provider.create
     end

spec/unit/puppet/provider/x509_request/openssl_spec.rb

@@ -45,7 +45,7 @@
                                                          '-key', '/tmp/foo.key',
                                                          '-config', '/tmp/foo.cnf',
                                                          '-out', '/tmp/foo.csr',
-                                                         ['-passin', 'pass:2x6${']
+                                                         '-passin', 'pass:2x6${',
                                                        ])
       resource.provider.create
     end