Merge pull request #701 from stevenpost/provider_cleanup

Provider cleanup

Author: h-haaks

lib/puppet/provider/mongodb.rb

@@ -192,15 +192,6 @@ def mongo_version
     self.class.mongo_version
   end
 
-  def self.mongo_26?
-    v = mongo_version
-    !v[%r{^2\.6\.}].nil?
-  end
-
-  def mongo_26?
-    self.class.mongo_26?
-  end
-
   def self.mongo_4?
     v = mongo_version
     !v[%r{^4\.}].nil?

lib/puppet/provider/mongodb_user/mongodb.rb

@@ -59,17 +59,12 @@ def create
         roles: role_hashes(@resource[:roles], @resource[:database]),
       }
 
-      if mongo_4? || mongo_5?
-        if @resource[:auth_mechanism] == :scram_sha_256
-          command[:mechanisms] = ['SCRAM-SHA-256']
-          command[:pwd] = @resource[:password]
-          command[:digestPassword] = true
-        else
-          command[:mechanisms] = ['SCRAM-SHA-1']
-          command[:pwd] = password_hash
-          command[:digestPassword] = false
-        end
+      if @resource[:auth_mechanism] == :scram_sha_256
+        command[:mechanisms] = ['SCRAM-SHA-256']
+        command[:pwd] = @resource[:password]
+        command[:digestPassword] = true
       else
+        command[:mechanisms] = ['SCRAM-SHA-1']
         command[:pwd] = password_hash
         command[:digestPassword] = false
       end
@@ -110,22 +105,15 @@ def password_hash=(_value)
     end
   end
 
-  def password=(value)
-    if mongo_26?
-      mongo_eval("db.changeUserPassword(#{@resource[:username].to_json}, #{value.to_json})", @resource[:database])
-    else
-      command = {
-        updateUser: @resource[:username],
-        pwd: @resource[:password],
-        digestPassword: true
-      }
+  def password=(_value)
+    command = {
+      updateUser: @resource[:username],
+      pwd: @resource[:password],
+      digestPassword: true,
+      mechanisms: @resource[:auth_mechanism] == :scram_sha_256 ? ['SCRAM-SHA-256'] : ['SCRAM-SHA-1']
+    }
 
-      if mongo_4? || mongo_5?
-        command[:mechanisms] = @resource[:auth_mechanism] == :scram_sha_256 ? ['SCRAM-SHA-256'] : ['SCRAM-SHA-1']
-      end
-
-      mongo_eval("db.runCommand(#{command.to_json})", @resource[:database])
-    end
+    mongo_eval("db.runCommand(#{command.to_json})", @resource[:database])
   end
 
   def roles=(roles)

spec/unit/puppet/provider/mongodb_spec.rb

@@ -14,7 +14,6 @@
 
   describe 'mongo version detection' do
     v = {
-      '2.6.x' => { '26' => true,  '4' => false, '5' => false },
       '4.x.x' => { '26' => false, '4' => true, '5' => false },
       '5.x.x' => { '26' => false, '4' => false, '5' => true },
       'x.x.x' => { '26' => false, '4' => false, '5' => false }
@@ -23,7 +22,6 @@
     v.each do |key, results|
       it "version detection for [#{key}]" do
         allow(provider_class).to receive(:mongo_eval).with('db.version()').and_return(key)
-        expect(provider_class.mongo_26?).to be results['26']
         expect(provider_class.mongo_4?).to be results['4']
         expect(provider_class.mongo_5?).to be results['5']
       end

spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb

@@ -7,7 +7,34 @@
 describe Puppet::Type.type(:mongodb_user).provider(:mongodb) do
   let(:raw_users) do
     [
-      { '_id' => 'admin.root', 'user' => 'root', 'db' => 'admin', 'credentials' => { 'MONGODB-CR' => 'pass', 'SCRAM-SHA-1' => { 'iterationCount' => 10_000, 'salt' => 'salt', 'storedKey' => 'storedKey', 'serverKey' => 'serverKey' } }, 'roles' => [{ 'role' => 'role2', 'db' => 'admin' }, { 'role' => 'role3', 'db' => 'user_database' }, { 'role' => 'role1', 'db' => 'admin' }] }
+      {
+        '_id' => 'admin.root',
+        'user' => 'root',
+        'db' => 'admin',
+        'credentials' => {
+          'MONGODB-CR' => 'pass',
+          'SCRAM-SHA-1' => {
+            'iterationCount' => 10_000,
+            'salt' => 'salt',
+            'storedKey' => 'storedKey',
+            'serverKey' => 'serverKey'
+          }
+        },
+        'roles' => [
+          {
+            'role' => 'role2',
+            'db' => 'admin'
+          },
+          {
+            'role' => 'role3',
+            'db' => 'user_database'
+          },
+          {
+            'role' => 'role1',
+            'db' => 'admin'
+          }
+        ]
+      }
     ].to_json
   end
 
@@ -33,7 +60,7 @@
     mongodconffile = tmp.path
     allow(provider.class).to receive(:mongod_conf_file).and_return(mongodconffile)
     allow(provider.class).to receive(:mongo_eval).with('printjson(db.system.users.find().toArray())').and_return(raw_users)
-    allow(provider.class).to receive(:mongo_version).and_return('2.6.x')
+    allow(provider.class).to receive(:mongo_version).and_return('4.4.0')
     allow(provider.class).to receive(:db_ismaster).and_return(true)
   end
 
@@ -58,6 +85,7 @@
         "createUser":"new_user",
         "customData":{"createdBy":"Puppet Mongodb_user['new_user']"},
         "roles":[{"role":"role1","db":"new_database"},{"role":"role2","db":"other_database"}],
+        "mechanisms":["SCRAM-SHA-1"],
         "pwd":"pass",
         "digestPassword":false
       }