Fix sharding acceptance testing

Author: h-haaks

lib/puppet/provider/mongodb_shard/mongo.rb

@@ -102,7 +102,7 @@ def self.shard_collection_details(obj, shard_name)
 
   def self.shard_properties(shard)
     properties = {}
-    output = mongo_command('sh.status()')
+    output = mongo_command('sh.status()')['value']
     output['shards'].each do |s|
       next unless s['_id'] == shard
 
@@ -118,7 +118,7 @@ def self.shard_properties(shard)
   end
 
   def self.shards_properties
-    output = mongo_command('sh.status()')
+    output = mongo_command('sh.status()')['value']
     properties = if output['shards'].empty?
                    []
                  else
@@ -163,64 +163,6 @@ def self.mongo_command(command, host = nil, _retries = 4)
       retry
     end
 
-    # NOTE: (spredzy) : sh.status()
-    # does not return a json stream
-    # we jsonify it so it is easier
-    # to parse and deal with it
-    if command == 'sh.status()'
-      myarr = output.split("\n")
-      myarr.shift
-      myarr.pop
-      myarr.pop
-      final_stream = []
-      prev_line = nil
-      in_shard_list = 0
-      in_chunk = 0
-      myarr.each do |line|
-        line.gsub!(%r{sharding version:}, '{ "sharding version":')
-        line.gsub!(%r{shards:}, ',"shards":[')
-        line.gsub!(%r{databases:}, '], "databases":[')
-        line.gsub!(%r{"clusterId" : ObjectId\("(.*)"\)}, '"clusterId" : "ObjectId(\'\1\')"')
-        line.gsub!(%r{\{  "_id" :}, ',{  "_id" :') if %r{_id} =~ prev_line
-        # Modification for shard
-        line = '' if line =~ %r{on :.*Timestamp}
-        if line =~ %r{_id} && in_shard_list == 1
-          in_shard_list = 0
-          last_line = final_stream.pop.strip
-          proper_line = "#{last_line}]},"
-          final_stream << proper_line
-        end
-        if line =~ %r{shard key} && in_shard_list == 1
-          shard_name = final_stream.pop.strip
-          proper_line = ",{\"#{shard_name}\":"
-          final_stream << proper_line
-        end
-        if line =~ %r{shard key} && in_shard_list.zero?
-          in_shard_list = 1
-          shard_name = final_stream.pop.strip
-          id_line = "#{final_stream.pop[0..-2]}, \"shards\": "
-          proper_line = "[{\"#{shard_name}\":"
-          final_stream << id_line
-          final_stream << proper_line
-        end
-        if in_chunk == 1
-          in_chunk = 0
-          line = "\"#{line.strip}\"}}"
-        end
-        in_chunk = 1 if line =~ %r{chunks} && in_chunk.zero?
-        line.gsub!(%r{shard key}, '{"shard key"')
-        line.gsub!(%r{chunks}, ',"chunks"')
-        final_stream << line unless line.empty?
-        prev_line = line
-      end
-      final_stream << ' ] }' if in_shard_list == 1
-      final_stream << ' ] }'
-      output = final_stream.join("\n")
-    end
-
-    # Hack to avoid non-json empty sets
-    output = '{}' if output == "null\n"
-    output.gsub!(%r{\s*}, '')
     JSON.parse(output)
   end
 end

spec/acceptance/sharding_spec.rb

@@ -7,21 +7,41 @@
 
 if hosts.length > 1 && supported_version?(default[:platform], repo_version)
   describe 'mongodb_shard resource' do
+    after :all do
+      pp = <<-EOS
+        class { 'mongodb::globals':
+          #{repo_ver_param}
+        }
+        -> class { 'mongodb::mongos' :
+          package_ensure => purged,
+          service_ensure => stopped
+        }
+        -> class { 'mongodb::server':
+          ensure         => absent,
+          package_ensure => purged,
+          service_ensure => stopped
+        }
+        -> class { 'mongodb::client':
+          ensure => purged
+        }
+      EOS
+
+      apply_manifest_on(hosts.reverse, pp, catch_failures: true)
+    end
+
     it 'configures the shard server' do
       pp = <<-EOS
         class { 'mongodb::globals':
           #{repo_ver_param}
         }
+        -> class { 'mongodb::client': }
         -> class { 'mongodb::server':
-          bind_ip   => '0.0.0.0',
+          bind_ip   => ['0.0.0.0'],
           replset   => 'foo',
           shardsvr  => true,
-        }->
-        mongodb_replset { 'foo' :
-          members => ["shard:27018"],
         }
-        if $::osfamily == 'RedHat' {
-          class { 'mongodb::client': }
+        -> mongodb_replset { 'foo' :
+          members => [#{hosts_as('shard').map { |x| "'#{x}:27018'" }.join(',')}],
         }
       EOS
 
@@ -34,27 +54,29 @@ class { 'mongodb::client': }
         class { 'mongodb::globals':
           #{repo_ver_param}
         }
+        -> class { 'mongodb::client': }
         -> class { 'mongodb::server':
-          bind_ip   => '0.0.0.0',
+          bind_ip   => ['0.0.0.0'],
+          replset   => 'conf',
           configsvr => true,
-        } ->
-        class { 'mongodb::mongos' :
-          configdb => ["router:27019"],
-        } ->
-        exec { '/bin/sleep 20' :
-        } ->
-        mongodb_shard { 'foo':
-          member => 'foo/shard:27018',
-          keys   => [{'foo.toto' => {'name' => 1}}]
         }
-        if $::osfamily == 'RedHat' {
-          class { 'mongodb::client': }
+        -> mongodb_replset { 'conf' :
+          members => [#{hosts_as('router').map { |x| "'#{x}:27019'" }.join(',')}],
+        }
+        -> class { 'mongodb::mongos' :
+          configdb => ["conf/#{hosts_as('router').map { |x| "#{x}:27019" }.join(',')}"],
+        }
+        -> exec { '/bin/sleep 20' :
+        }
+        -> mongodb_shard { 'foo':
+          member => "foo/#{hosts_as('shard').map { |x| "#{x}:27018" }.join(',')}",
+          keys   => [{'foo.toto' => {'name' => 1}}]
         }
       EOS
 
-      apply_manifest_on(hosts_as('router'), pp, catch_failures: true)
+      apply_manifest_on(hosts_as('router'), pp, catch_failures: true, trace: true)
       on(hosts_as('router'), 'mongosh --quiet --eval "EJSON.stringify(sh.status())"') do |r|
-        expect(r.stdout).to match %r{foo/shard:27018}
+        expect(r.stdout).to match %r{foo/#{hosts[0]}:27018}
         expect(r.stdout).to match %r{foo\.toto}
       end
     end

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

@@ -20,21 +20,23 @@
 
   let(:raw_shards) do
     {
-      'sharding version' => {
-        '_id' => 1,
-        'version' => 4,
-        'minCompatibleVersion' => 4,
-        'currentVersion' => 5,
-        'clusterId' => "ObjectId('548e9110f3aca177c94c5e49')"
-      },
-      'shards' => [
-        {  '_id' => 'rs_test', 'host' => 'rs_test/mongo1:27018' }
-      ],
-      'databases' => [
-        {  '_id' => 'admin', 'partitioned' => false, 'primary' => 'config' },
-        {  '_id' => 'test', 'partitioned' => false, 'primary' => 'rs_test' },
-        {  '_id' => 'rs_test', 'partitioned' => true, 'primary' => 'rs_test' }
-      ]
+      'value' => {
+        'sharding version' => {
+          '_id' => 1,
+          'version' => 4,
+          'minCompatibleVersion' => 4,
+          'currentVersion' => 5,
+          'clusterId' => "ObjectId('548e9110f3aca177c94c5e49')"
+        },
+        'shards' => [
+          {  '_id' => 'rs_test', 'host' => 'rs_test/mongo1:27018' }
+        ],
+        'databases' => [
+          {  '_id' => 'admin', 'partitioned' => false, 'primary' => 'config' },
+          {  '_id' => 'test', 'partitioned' => false, 'primary' => 'rs_test' },
+          {  '_id' => 'rs_test', 'partitioned' => true, 'primary' => 'rs_test' }
+        ]
+      }
     }
   end