Merge branch 'mk/fix-selective-sync-by-shards' into 'master'

Fix ability to choose shards for selective sync

See merge request gitlab-org/gitlab-ee!8717

ee/app/controllers/admin/geo/nodes_controller.rb

@@ -48,12 +48,12 @@ class Admin::Geo::NodesController < Admin::ApplicationController
       :url,
       :primary,
       :selective_sync_type,
-      :selective_sync_shards,
       :namespace_ids,
       :repos_max_capacity,
       :files_max_capacity,
       :verification_max_capacity,
-      :minimum_reverification_interval
+      :minimum_reverification_interval,
+      selective_sync_shards: []
     )
   end
 

ee/changelogs/unreleased/mk-fix-selective-sync-by-shards.yml

+---
+title: Fix ability to choose shards for selective sync
+merge_request: 8717
+author:
+type: fixed

ee/spec/controllers/admin/geo/nodes_controller_spec.rb

@@ -86,7 +86,7 @@ describe Admin::Geo::NodesController, :postgresql do
   end
 
   describe '#update' do
-    let(:geo_node_attributes) { { url: 'http://example.com' } }
+    let(:geo_node_attributes) { { url: 'http://example.com', selective_sync_shards: %w[foo bar] } }
 
     let(:geo_node) { create(:geo_node) }
 
@@ -113,6 +113,7 @@ describe Admin::Geo::NodesController, :postgresql do
 
         geo_node.reload
         expect(geo_node.url.chomp('/')).to eq(geo_node_attributes[:url])
+        expect(geo_node.selective_sync_shards).to eq(%w[foo bar])
       end
 
       it 'delegates the update of the Geo node to Geo::NodeUpdateService' do