Merge branch 'move-geo-secondary-to-underscored-form' into 'master'

Move geo-secondary settings to underscored form

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



Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: Balasankar "Balu" C <balasankar@gitlab.com>

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

@@ -55,25 +55,25 @@ default['gitlab']['gitlab-rails']['geo_registry_replication_primary_api_url'] =
 ###
 # Geo: Secondary node configuration
 ###
-default['gitlab']['geo-secondary']['enable'] = false
-default['gitlab']['geo-secondary']['auto_migrate'] = true
-default['gitlab']['geo-secondary']['db_adapter'] = "postgresql"
-default['gitlab']['geo-secondary']['db_encoding'] = "unicode"
-default['gitlab']['geo-secondary']['db_collation'] = nil
-default['gitlab']['geo-secondary']['db_database'] = "gitlabhq_geo_production"
-default['gitlab']['geo-secondary']['db_username'] = "gitlab_geo"
-default['gitlab']['geo-secondary']['db_password'] = nil
-default['gitlab']['geo-secondary']['db_load_balancing'] = { 'hosts' => [] }
+default['gitlab']['geo_secondary']['enable'] = false
+default['gitlab']['geo_secondary']['auto_migrate'] = true
+default['gitlab']['geo_secondary']['db_adapter'] = "postgresql"
+default['gitlab']['geo_secondary']['db_encoding'] = "unicode"
+default['gitlab']['geo_secondary']['db_collation'] = nil
+default['gitlab']['geo_secondary']['db_database'] = "gitlabhq_geo_production"
+default['gitlab']['geo_secondary']['db_username'] = "gitlab_geo"
+default['gitlab']['geo_secondary']['db_password'] = nil
+default['gitlab']['geo_secondary']['db_load_balancing'] = { 'hosts' => [] }
 # Path to postgresql socket directory
-default['gitlab']['geo-secondary']['db_host'] = "/var/opt/gitlab/geo-postgresql"
-default['gitlab']['geo-secondary']['db_port'] = 5431
-default['gitlab']['geo-secondary']['db_socket'] = nil
-default['gitlab']['geo-secondary']['db_sslmode'] = nil
-default['gitlab']['geo-secondary']['db_sslcompression'] = 0
-default['gitlab']['geo-secondary']['db_sslrootcert'] = nil
-default['gitlab']['geo-secondary']['db_sslca'] = nil
-default['gitlab']['geo-secondary']['db_prepared_statements'] = false
-default['gitlab']['geo-secondary']['db_database_tasks'] = true
+default['gitlab']['geo_secondary']['db_host'] = "/var/opt/gitlab/geo-postgresql"
+default['gitlab']['geo_secondary']['db_port'] = 5431
+default['gitlab']['geo_secondary']['db_socket'] = nil
+default['gitlab']['geo_secondary']['db_sslmode'] = nil
+default['gitlab']['geo_secondary']['db_sslcompression'] = 0
+default['gitlab']['geo_secondary']['db_sslrootcert'] = nil
+default['gitlab']['geo_secondary']['db_sslca'] = nil
+default['gitlab']['geo_secondary']['db_prepared_statements'] = false
+default['gitlab']['geo_secondary']['db_database_tasks'] = true
 ###
 # Geo: PostgreSQL (Tracking database)
@@ -163,3 +163,4 @@ default['gitlab']['geo-logcursor']['log_directory'] = '/var/log/gitlab/geo-logcu
 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']")
+default['gitlab']['geo-secondary'] = Gitlab::Deprecations::NodeAttribute.new(proc { node['gitlab']['geo_secondary'].to_h }, "node['gitlab']['geo-secondary']", "node['gitlab']['geo_secondary']")

files/gitlab-cookbooks/gitlab-ee/libraries/geo_secondary.rb

@@ -25,7 +25,7 @@ module GeoSecondary
         # Set default value for attributes of geo database based on
         # geo_secondary[`db_*`] settings.
         geo_database_attributes.each do |attribute|
-          Gitlab['gitlab_rails']['databases']['geo'][attribute] ||= Gitlab['geo_secondary'][attribute] || node['gitlab']['geo-secondary'][attribute]
+          Gitlab['gitlab_rails']['databases']['geo'][attribute] ||= Gitlab['geo_secondary'][attribute] || node['gitlab']['geo_secondary'][attribute]
         end
         # Set db_migrations_path since Geo migration lives in a non-default place
@@ -42,7 +42,7 @@ module GeoSecondary
     end
     def geo_database_attributes
-      node['gitlab']['geo-secondary'].to_h.keys.select { |k| k.start_with?('db_') }
+      node['gitlab']['geo_secondary'].to_h.keys.select { |k| k.start_with?('db_') }
     end
     def geo_database_enabled?

files/gitlab-cookbooks/gitlab-ee/libraries/gitlab_geo_helper.rb

@@ -4,6 +4,6 @@ class GitlabGeoHelper < RailsMigrationHelper
   def initialize(node)
     @node = node
     @status_file_prefix = 'geo-db-migrate'
-    @attributes_node = node['gitlab']['geo-secondary']
+    @attributes_node = node['gitlab']['geo_secondary']
   end
 end

files/gitlab-cookbooks/gitlab-ee/recipes/geo-postgresql.rb

@@ -124,7 +124,7 @@ end
 geo_pg_port = node['gitlab']['geo-postgresql']['port']
 geo_pg_user = node['gitlab']['geo-postgresql']['sql_user']
 geo_pg_user_password = node['gitlab']['geo-postgresql']['sql_user_password']
-geo_database_name = node['gitlab']['geo-secondary']['db_database']
+geo_database_name = node['gitlab']['geo_secondary']['db_database']
 if node['gitlab']['geo-postgresql']['enable']
   postgresql_user geo_pg_user do

files/gitlab-cookbooks/gitlab-ee/templates/default/gitlab-geo-psql-rc.erb

@@ -2,4 +2,4 @@ psql_user='<%= node['postgresql']['username'] %>'
 psql_group='<%= node['postgresql']['group'] %>'
 psql_host='<%= node['gitlab']['geo-postgresql']['unix_socket_directory'] %>'
 psql_port='<%= node['gitlab']['geo-postgresql']['port'] %>'
-psql_dbname='<%= node['gitlab']['geo-secondary']['db_database'] %>'
+psql_dbname='<%= node['gitlab']['geo_secondary']['db_database'] %>'

files/gitlab-cookbooks/gitlab/libraries/helpers/geo_pg_helper.rb

@@ -16,7 +16,7 @@ class GeoPgHelper < BasePgHelper
   def connection_info
     build_connection_info(
-      node['gitlab']['geo-secondary']['db_database'],
+      node['gitlab']['geo_secondary']['db_database'],
       node['gitlab']['geo-postgresql']['unix_socket_directory'],
       node['gitlab']['geo-postgresql']['port'],
       node['gitlab']['geo-postgresql']['sql_user']

files/gitlab-cookbooks/package/libraries/deprecations.rb

@@ -69,7 +69,7 @@ module Gitlab
             note: "Read-only mode is repository specific and always enabled after suspected data loss. See https://docs.gitlab.com/ee/administration/gitaly/praefect.html#read-only-mode"
           },
           {
-            config_keys: %w(gitlab geo-secondary db_fdw),
+            config_keys: %w(gitlab geo_secondary db_fdw),
             deprecation: '13.3',
             removal: '14.0', # https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6138
             note: "Geo does not require Foreign Data Wrapper (FDW) to be configured to replicate data."

files/gitlab-cookbooks/package/libraries/settings_dsl.rb

@@ -42,6 +42,7 @@ module SettingsDSL
     registry_nginx
     gitlab_kas_nginx
     gitlab_kas
+    geo_secondary
   ].freeze
   def self.extended(base)

files/gitlab-cookbooks/pgbouncer/recipes/user.rb

@@ -26,7 +26,7 @@ if pgb_helper.create_pgbouncer_user?('geo-postgresql')
     helper lazy { GeoPgHelper.new(node) }
     user node['gitlab']['geo-postgresql']['pgbouncer_user']
     password node['gitlab']['geo-postgresql']['pgbouncer_user_password']
-    database node['gitlab']['geo-secondary']['db_database']
+    database node['gitlab']['geo_secondary']['db_database']
     add_auth_function default_auth_query.eql?(auth_query)
     action :create
   end

files/gitlab-cookbooks/postgresql/resources/config.rb

@@ -8,7 +8,7 @@ action :create do
   postgresql_helper = new_resource.helper
   template postgresql_helper.postgresql_config do
-    geo_config = { geo_secondary_enabled: node.dig('gitlab', 'geo-secondary', 'enable') }
+    geo_config = { geo_secondary_enabled: node.dig('gitlab', 'geo_secondary', 'enable') }
     source 'postgresql.conf.erb'
     owner new_resource.username
     mode '0644'

spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb

@@ -38,6 +38,7 @@ RSpec.describe SettingsDSL::Utils do
         %w[remote-syslog remote_syslog],
         %w[gitlab-workhorse gitlab_workhorse],
         %w[gitlab-kas gitlab_kas],
+        %w[geo-secondary geo_secondary],
       ].each do |input, output|
         expect(subject.sanitized_key(input)).to eq(output)
       end