Merge branch 'configure-rails-extra-db-config-command' into 'master'

Configure rails db_extra_config_command attribute

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Reviewed-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Andrew Patterson <[email protected]>

Author: balasankarc

files/gitlab-config-template/gitlab.rb.template

@@ -759,6 +759,9 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['db_application_name'] = nil
 # gitlab_rails['db_database_tasks'] = true
 
+##! Command to generate extra database configuration
+# gitlab_rails['db_extra_config_command'] = nil
+
 ### Gitlab decomposed database settings
 ###! Docs: https://docs.gitlab.com/omnibus/settings/database.html
 # gitlab_rails['databases']['main']['db_database'] = 'gitlabhq_production'

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -425,6 +425,7 @@
 default['gitlab']['gitlab_rails']['db_keepalives_count'] = nil
 default['gitlab']['gitlab_rails']['db_tcp_user_timeout'] = nil
 default['gitlab']['gitlab_rails']['db_application_name'] = nil
+default['gitlab']['gitlab_rails']['db_extra_config_command'] = nil
 
 default['gitlab']['gitlab_rails']['databases'] = {}
 default['gitlab']['gitlab_rails']['clickhouse_databases'] = {}

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

@@ -3,6 +3,9 @@
 # and run `sudo gitlab-ctl reconfigure`.
 
 production:
+<% if !@db_extra_config_command.nil? -%>
+  config_command: <%= quote(@db_extra_config_command) %>
+<% end -%>
   <% # database.yml must always have `main` first, sort it to the front %>
   <% @databases.sort_by { |name, config| name == "main" ? 0 : 1 }.each do |database, attributes| %>
   <%= database %>:

spec/chef/cookbooks/gitlab/recipes/gitlab-rails_spec.rb

@@ -817,7 +817,8 @@
               'db_sslcompression' => 0,
               'db_sslcert' => nil,
               'db_sslkey' => nil,
-              'db_application_name' => nil
+              'db_application_name' => nil,
+              'db_extra_config_command' => nil
             )
           )
         end
@@ -994,6 +995,29 @@
             )
           end
         end
+
+        context 'when db_extra_config_command is specified' do
+          cached(:chef_run) do
+            ChefSpec::SoloRunner.new(step_into: %w(templatesymlink)).converge('gitlab::default')
+          end
+
+          before do
+            stub_gitlab_rb(
+              gitlab_rails: {
+                db_extra_config_command: '/opt/database-config.sh'
+              }
+            )
+          end
+
+          it 'uses specified value in database.yml' do
+            expect(chef_run).to create_templatesymlink('Create a database.yml and create a symlink to Rails root').with_variables(
+              hash_including(
+                'db_extra_config_command' => '/opt/database-config.sh'
+              )
+            )
+            expect(generated_yml_content.dig('production', 'config_command')).to eq('/opt/database-config.sh')
+          end
+        end
       end
 
       describe 'client side statement_timeout' do