# HG changeset patch # User Balasankar 'Balu' C <balasankar@gitlab.com> # Date 1679019479 0 # Fri Mar 17 02:17:59 2023 +0000 # Node ID 66e41b1cee20d5a82e12d8c2fbcdc63e0c730d62 # Parent 5c7944ea6804f386d592a7039dee6d21df54f74f Deprecate usage of node['gitlab']['suggested-reviewers'] in gitlab.rb Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6873 Changelog: deprecated Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com> diff --git a/files/gitlab-cookbooks/gitlab-ee/attributes/default.rb b/files/gitlab-cookbooks/gitlab-ee/attributes/default.rb --- a/files/gitlab-cookbooks/gitlab-ee/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab-ee/attributes/default.rb @@ -161,3 +161,5 @@ default['gitlab']['geo-logcursor']['ha'] = false default['gitlab']['geo-logcursor']['log_directory'] = '/var/log/gitlab/geo-logcursor' default['gitlab']['geo-logcursor']['env_directory'] = '/opt/gitlab/etc/geo-logcursor/env' + +default['gitlab']['suggested-reviewers'] = Gitlab::Deprecations::NodeAttribute.new(proc { node['gitlab']['suggested_reviewers'].to_h }, "node['gitlab']['suggested-reviewers']", "node['gitlab']['suggested_reviewers']") diff --git a/files/gitlab-cookbooks/gitlab-ee/recipes/suggested_reviewers.rb b/files/gitlab-cookbooks/gitlab-ee/recipes/suggested_reviewers.rb --- a/files/gitlab-cookbooks/gitlab-ee/recipes/suggested_reviewers.rb +++ b/files/gitlab-cookbooks/gitlab-ee/recipes/suggested_reviewers.rb @@ -36,7 +36,7 @@ group 'root' mode '0644' sensitive true - variables(secret_token: node['gitlab']['suggested-reviewers']['api_secret_key']) + variables(secret_token: node['gitlab']['suggested_reviewers']['api_secret_key']) dependent_services.each { |svc| notifies :restart, svc } - only_if { node['gitlab']['suggested-reviewers']['api_secret_key'] } + only_if { node['gitlab']['suggested_reviewers']['api_secret_key'] } end diff --git a/files/gitlab-cookbooks/package/libraries/settings_dsl.rb b/files/gitlab-cookbooks/package/libraries/settings_dsl.rb --- a/files/gitlab-cookbooks/package/libraries/settings_dsl.rb +++ b/files/gitlab-cookbooks/package/libraries/settings_dsl.rb @@ -259,6 +259,7 @@ postgres_exporter pgbouncer_exporter gitlab_shell + suggested_reviewers ] return underscored_form(key) if skip_hyphenation.include?(underscored_form(key)) diff --git a/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb b/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb --- a/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb +++ b/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb @@ -33,6 +33,7 @@ %w[postgres-exporter postgres_exporter], %w[pgbouncer-exporter pgbouncer_exporter], %w[gitlab-shell gitlab_shell], + %w[suggested-reviewers suggested_reviewers], ].each do |input, output| expect(subject.sanitized_key(input)).to eq(output) end