Merge branch 'sh-fix-specs-ruby-3.1' into 'master'

Update specs to pass with Ruby 3.0 and 3.1

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Reviewed-by: Clemens Beck <[email protected]>
Co-authored-by: Stan Hu <[email protected]>

Author: balasankarc

spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_disable_spec.rb

@@ -4,7 +4,7 @@
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(templatesymlink)).converge('gitlab-ee::default') }
   let(:database_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/database.yml') }
   let(:database_yml_file_content) { ChefSpec::Renderer.new(chef_run, database_yml_template).content }
-  let(:database_yml) { YAML.safe_load(database_yml_file_content, [], [], true, symbolize_names: true) }
+  let(:database_yml) { YAML.safe_load(database_yml_file_content, aliases: true, symbolize_names: true) }
 
   before do
     allow(Gitlab).to receive(:[]).and_call_original

spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_spec.rb

@@ -4,7 +4,7 @@
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(templatesymlink)).converge('gitlab-ee::default') }
   let(:database_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/database.yml') }
   let(:database_yml_file_content) { ChefSpec::Renderer.new(chef_run, database_yml_template).content }
-  let(:database_yml) { YAML.safe_load(database_yml_file_content, [], [], true, symbolize_names: true) }
+  let(:database_yml) { YAML.safe_load(database_yml_file_content, aliases: true, symbolize_names: true) }
   let(:default_database_settings) do
     {
       adapter: 'postgresql',

spec/chef/cookbooks/gitlab-kas/recipes/gitlab-kas_spec.rb

@@ -714,6 +714,6 @@ def files
   def chef_run_load_yaml_template(chef_run, path)
     template = chef_run.template(path)
     file_content = ChefSpec::Renderer.new(chef_run, template).content
-    YAML.safe_load(file_content, [], [], true, symbolize_names: true)
+    YAML.safe_load(file_content, aliases: true, symbolize_names: true)
   end
 end

spec/chef/cookbooks/gitlab/recipes/gitlab-rails/click_house_yml_spec.rb

@@ -5,7 +5,7 @@
     let(:chef_run) { ChefSpec::SoloRunner.new(step_into: 'templatesymlink').converge('gitlab::default') }
     let(:clickhouse_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/click_house.yml') }
     let(:clickhouse_yml_file_content) { ChefSpec::Renderer.new(chef_run, clickhouse_yml_template).content }
-    let(:clickhouse_yml) { YAML.safe_load(clickhouse_yml_file_content, [], [], true, symbolize_names: true) }
+    let(:clickhouse_yml) { YAML.safe_load(clickhouse_yml_file_content, aliases: true, symbolize_names: true) }
 
     before do
       allow(Gitlab).to receive(:[]).and_call_original

spec/chef/cookbooks/gitlab/recipes/gitlab-rails/database_yml_spec.rb

@@ -5,7 +5,7 @@
     let(:chef_run) { ChefSpec::SoloRunner.new(step_into: 'templatesymlink').converge('gitlab::default') }
     let(:database_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/database.yml') }
     let(:database_yml_file_content) { ChefSpec::Renderer.new(chef_run, database_yml_template).content }
-    let(:database_yml) { YAML.safe_load(database_yml_file_content, [], [], true, symbolize_names: true) }
+    let(:database_yml) { YAML.safe_load(database_yml_file_content, aliases: true, symbolize_names: true) }
     let(:default_database_settings) do
       {
         adapter: 'postgresql',

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

@@ -309,7 +309,7 @@
     context 'with TLS settings' do
       let(:resque_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/resque.yml') }
       let(:resque_yml_file_content) { ChefSpec::Renderer.new(chef_run, resque_yml_template).content }
-      let(:resque_yml) { YAML.safe_load(resque_yml_file_content, [], [], true, symbolize_names: true) }
+      let(:resque_yml) { YAML.safe_load(resque_yml_file_content, aliases: true, symbolize_names: true) }
 
       before do
         stub_gitlab_rb(

spec/chef/cookbooks/gitlab/recipes/mailroom_spec.rb

@@ -26,7 +26,7 @@
   shared_examples 'renders Microsoft Graph config' do
     let(:gitlab_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/gitlab.yml') }
     let(:gitlab_yml_file_content) { ChefSpec::Renderer.new(chef_run, gitlab_yml_template).content }
-    let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, [], [], true, symbolize_names: true) }
+    let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, aliases: true, symbolize_names: true) }
     let(:inbox_options) do
       {
         tenant_id: 'MY-TENANT-ID',
@@ -58,7 +58,7 @@
   shared_examples 'configured sidekiq delivery method' do
     let(:gitlab_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/gitlab.yml') }
     let(:gitlab_yml_file_content) { ChefSpec::Renderer.new(chef_run, gitlab_yml_template).content }
-    let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, [], [], true, symbolize_names: true) }
+    let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, aliases: true, symbolize_names: true) }
 
     before do
       stub_gitlab_rb(
@@ -81,7 +81,7 @@
   shared_examples 'configured webhook delivery method' do
     let(:gitlab_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/gitlab.yml') }
     let(:gitlab_yml_file_content) { ChefSpec::Renderer.new(chef_run, gitlab_yml_template).content }
-    let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, [], [], true, symbolize_names: true) }
+    let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, aliases: true, symbolize_names: true) }
 
     before do
       configured_mailroom = config_sections.each_with_object({}) do |config_section, memo|

spec/chef/cookbooks/monitoring/recipes/gitlab-exporter_spec.rb

@@ -52,9 +52,7 @@
 
       expect(chef_run).to render_file('/var/opt/gitlab/gitlab-exporter/gitlab-exporter.yml')
         .with_content { |content|
-          # Not disabling this Cop fails the test with:
-          # Psych::BadAlias: Unknown alias: db_common
-          settings = YAML.load(content) # rubocop:disable Security/YAMLLoad
+          settings = YAML.safe_load(content, aliases: true)
           expect(settings.dig('server', 'name')).to eq('webrick')
           expect(settings.dig('probes', 'database')).not_to be_nil
           expect(settings.dig('probes', 'ruby')).not_to be_nil
@@ -109,9 +107,7 @@
     it 'populates TLS related settings in config file' do
       expect(chef_run).to render_file('/var/opt/gitlab/gitlab-exporter/gitlab-exporter.yml')
         .with_content { |content|
-          # Not disabling this Cop fails the test with:
-          # Psych::BadAlias: Unknown alias: db_common
-          settings = YAML.load(content) # rubocop:disable Security/YAMLLoad
+          settings = YAML.safe_load(content, aliases: true)
           expect(settings.dig('server', 'tls_enabled')).to be_truthy
           expect(settings.dig('server', 'listen_address')).to eq('0.0.0.0')
           expect(settings.dig('server', 'listen_port')).to eq(8443)
@@ -174,7 +170,7 @@
     it 'adds tranport options to elasticsearch config' do
       expect(chef_run).to render_file('/var/opt/gitlab/gitlab-exporter/gitlab-exporter.yml')
         .with_content { |content|
-          transport_options = YAML.load(content) # rubocop:disable Security/YAMLLoad
+          transport_options = YAML.safe_load(content, aliases: true)
             .dig('probes', 'elasticsearch', 'opts').first['options']
           expect(transport_options).to eq({ 'headers' => { 'Authorization' => authorization } })
         }

spec/chef/cookbooks/monitoring/recipes/prometheus_spec.rb

@@ -383,7 +383,7 @@
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:prometheus_yml_template) { chef_run.file('/var/opt/gitlab/prometheus/prometheus.yml') }
   let(:prometheus_yml_file_content) { ChefSpec::Renderer.new(chef_run, prometheus_yml_template).content }
-  let(:prometheus_yml) { YAML.safe_load(prometheus_yml_file_content, [], [], true, symbolize_names: true) }
+  let(:prometheus_yml) { YAML.safe_load(prometheus_yml_file_content, aliases: true, symbolize_names: true) }
 
   let(:default_vars) do
     {

spec/chef/support/shared_context/gitlab_rails_shared_context.rb

@@ -4,7 +4,7 @@
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: 'templatesymlink').converge('gitlab::default') }
   let(:gitlab_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/gitlab.yml') }
   let(:gitlab_yml_file_content) { ChefSpec::Renderer.new(chef_run, gitlab_yml_template).content }
-  let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, [], [], true, symbolize_names: true) }
+  let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, aliases: true, symbolize_names: true) }
   let(:config_dir) { '/var/opt/gitlab/gitlab-rails/etc/' }
 
   before do