Move ElasticSearch application settings to the EE model extension

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/models/application_setting.rb

@@ -105,10 +105,6 @@ class ApplicationSetting < ActiveRecord::Base
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }
 
-  validates :repository_size_limit,
-            presence: true,
-            numericality: { only_integer: true, greater_than_or_equal_to: 0 }
-
   validates :max_artifacts_size,
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }
@@ -119,14 +115,6 @@ class ApplicationSetting < ActiveRecord::Base
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }
 
-  validates :elasticsearch_url,
-            presence: { message: "can't be blank when indexing is enabled" },
-            if: :elasticsearch_indexing?
-
-  validates :elasticsearch_aws_region,
-            presence: { message: "can't be blank when using aws hosted elasticsearch" },
-            if: ->(setting) { setting.elasticsearch_indexing? && setting.elasticsearch_aws? }
-
   validates :repository_storages, presence: true
   validate :check_repository_storages
 
@@ -338,11 +326,7 @@ class ApplicationSetting < ActiveRecord::Base
       usage_ping_enabled: Settings.gitlab['usage_ping_enabled'],
       gitaly_timeout_fast: 10,
       gitaly_timeout_medium: 30,
-      gitaly_timeout_default: 55,
-      slack_app_enabled: false,
-      slack_app_id: nil,
-      slack_app_secret: nil,
-      slack_app_verification_token: nil
+      gitaly_timeout_default: 55
     }
   end
 
@@ -358,36 +342,6 @@ class ApplicationSetting < ActiveRecord::Base
     end
   end
 
-  def elasticsearch_indexing
-    License.feature_available?(:elastic_search) && super
-  end
-  alias_method :elasticsearch_indexing?, :elasticsearch_indexing
-
-  def elasticsearch_search
-    License.feature_available?(:elastic_search) && super
-  end
-  alias_method :elasticsearch_search?, :elasticsearch_search
-
-  def elasticsearch_url
-    read_attribute(:elasticsearch_url).split(',').map(&:strip)
-  end
-
-  def elasticsearch_url=(values)
-    cleaned = values.split(',').map {|url| url.strip.gsub(%r{/*\z}, '') }
-
-    write_attribute(:elasticsearch_url, cleaned.join(','))
-  end
-
-  def elasticsearch_config
-    {
-      url:                   elasticsearch_url,
-      aws:                   elasticsearch_aws,
-      aws_access_key:        elasticsearch_aws_access_key,
-      aws_secret_access_key: elasticsearch_aws_secret_access_key,
-      aws_region:            elasticsearch_aws_region
-    }
-  end
-
   def home_page_url_column_exists?
     ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url)
   end

ee/app/models/ee/application_setting.rb

@@ -27,21 +27,40 @@ module EE
                 numericality: { allow_nil: true, only_integer: true, greater_than: 0 }
 
       validate :mirror_capacity_threshold_less_than
+
+      validates :repository_size_limit,
+                presence: true,
+                numericality: { only_integer: true, greater_than_or_equal_to: 0 }
+
+      validates :elasticsearch_url,
+                presence: { message: "can't be blank when indexing is enabled" },
+                if: ->(setting) { setting.elasticsearch_indexing? }
+
+      validates :elasticsearch_aws_region,
+                presence: { message: "can't be blank when using aws hosted elasticsearch" },
+                if: ->(setting) { setting.elasticsearch_indexing? && setting.elasticsearch_aws? }
     end
 
     module ClassMethods
+      extend ::Gitlab::Utils::Override
+
+      override :defaults
       def defaults
         super.merge(
+          allow_group_owners_to_manage_ldap: true,
           default_project_creation: ::EE::Gitlab::Access::DEVELOPER_MASTER_PROJECT_ACCESS,
-          elasticsearch_url: ENV['ELASTIC_URL'] || 'http://localhost:9200',
           elasticsearch_aws: false,
           elasticsearch_aws_region: ENV['ELASTIC_REGION'] || 'us-east-1',
-          repository_size_limit: 0,
-          mirror_max_delay: Settings.gitlab['mirror_max_delay'],
-          mirror_max_capacity: Settings.gitlab['mirror_max_capacity'],
+          elasticsearch_url: ENV['ELASTIC_URL'] || 'http://localhost:9200',
           mirror_capacity_threshold: Settings.gitlab['mirror_capacity_threshold'],
-          allow_group_owners_to_manage_ldap: true,
-          mirror_available: true
+          mirror_max_capacity: Settings.gitlab['mirror_max_capacity'],
+          mirror_max_delay: Settings.gitlab['mirror_max_delay'],
+          mirror_available: true,
+          repository_size_limit: 0,
+          slack_app_enabled: false,
+          slack_app_id: nil,
+          slack_app_secret: nil,
+          slack_app_verification_token: nil
         )
       end
     end
@@ -50,6 +69,40 @@ module EE
       check_namespace_plan? && ::Gitlab.dev_env_or_com?
     end
 
+    def elasticsearch_indexing
+      return false unless elasticsearch_indexing_column_exists?
+
+      License.feature_available?(:elastic_search) && super
+    end
+    alias_method :elasticsearch_indexing?, :elasticsearch_indexing
+
+    def elasticsearch_search
+      return false unless elasticsearch_search_column_exists?
+
+      License.feature_available?(:elastic_search) && super
+    end
+    alias_method :elasticsearch_search?, :elasticsearch_search
+
+    def elasticsearch_url
+      read_attribute(:elasticsearch_url).split(',').map(&:strip)
+    end
+
+    def elasticsearch_url=(values)
+      cleaned = values.split(',').map {|url| url.strip.gsub(%r{/*\z}, '') }
+
+      write_attribute(:elasticsearch_url, cleaned.join(','))
+    end
+
+    def elasticsearch_config
+      {
+        url:                   elasticsearch_url,
+        aws:                   elasticsearch_aws,
+        aws_access_key:        elasticsearch_aws_access_key,
+        aws_secret_access_key: elasticsearch_aws_secret_access_key,
+        aws_region:            elasticsearch_aws_region
+      }
+    end
+
     private
 
     def mirror_max_delay_in_minutes
@@ -63,5 +116,13 @@ module EE
         errors.add(:mirror_capacity_threshold, "Project's mirror capacity threshold can't be higher than it's maximum capacity")
       end
     end
+
+    def elasticsearch_indexing_column_exists?
+      ActiveRecord::Base.connection.column_exists?(:application_settings, :elasticsearch_indexing)
+    end
+
+    def elasticsearch_search_column_exists?
+      ActiveRecord::Base.connection.column_exists?(:application_settings, :elasticsearch_search)
+    end
   end
 end