Merge branch 'sc1-add-shard-to-routing-rule' into 'master'

Allow routing rules to contain shard information

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7512

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Mitchell Nielsen <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Sylvester Chin <[email protected]>

Author: balasankarc

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -453,8 +453,12 @@ production: &base
     log_format: <%= @sidekiq['log_format'] %>
     <% unless @sidekiq['routing_rules'].empty? %>
     routing_rules:
-      <% @sidekiq['routing_rules'].each do |query, queue| %>
+      <% @sidekiq['routing_rules'].each do |query, queue, shard_instance| %>
+        <% if shard_instance.nil? %>
       - [<%= quote(query) %>, <%= queue.nil? ? 'null' : quote(queue) %>]
+        <% else %>
+      - [<%= quote(query) %>, <%= queue.nil? ? 'null' : quote(queue) %>, <%= quote(shard_instance) %>]
+        <% end %>
       <% end %>
     <% end %>
 

spec/chef/cookbooks/gitlab/recipes/gitlab-rails/gitlab_yml/sidekiq_spec.rb

@@ -74,6 +74,28 @@
           )
         end
       end
+
+      context 'with a valid routing rules list containing shard details' do
+        before do
+          stub_gitlab_rb(
+            sidekiq: {
+              routing_rules: [
+                ["resource_boundary=cpu", "cpu_boundary"],
+                ["*", "default", "default"]
+              ]
+            }
+          )
+        end
+
+        it 'renders gitlab.yml with user specified value for sidekiq routing rules' do
+          expect(gitlab_yml[:production][:sidekiq][:routing_rules]).to eq(
+            [
+              ["resource_boundary=cpu", "cpu_boundary"],
+              ["*", "default", "default"]
+            ]
+          )
+        end
+      end
     end
   end
 end