Split up ldap_extras feature into ldap_group_sync and multiple_ldap_servers

app/controllers/groups/ldaps_controller.rb

@@ -17,6 +17,6 @@ class Groups::LdapsController < Groups::ApplicationController
   private
 
   def check_enabled_extras!
-    render_404 unless Gitlab::LDAP::Config.enabled_extras?
+    render_404 unless Gitlab::LDAP::Config.enabled? && ::License.feature_available?(:ldap_group_sync)
   end
 end

app/models/license.rb

@@ -18,7 +18,8 @@ class License < ActiveRecord::Base
     issue_board_milestone
     issue_weights
     jenkins_integration
-    ldap_extras
+    ldap_group_sync
+    multiple_ldap_servers
     merge_request_approvers
     merge_request_rebase
     merge_request_squash
@@ -108,7 +109,8 @@ class License < ActiveRecord::Base
     elastic_search
     extended_audit_events
     geo
-    ldap_extras
+    ldap_group_sync
+    multiple_ldap_servers
     object_storage
     repository_size_limit
   ].freeze

app/workers/ldap_all_groups_sync_worker.rb

@@ -3,7 +3,7 @@ class LdapAllGroupsSyncWorker
   include CronjobQueue
 
   def perform
-    return unless Gitlab::LDAP::Config.enabled_extras?
+    return unless Gitlab::LDAP::Config.enabled? && ::License.feature_available?(:ldap_group_sync)
 
     logger.info 'Started LDAP group sync'
     EE::Gitlab::LDAP::Sync::Groups.execute

app/workers/ldap_group_sync_worker.rb

@@ -3,7 +3,7 @@ class LdapGroupSyncWorker
   include DedicatedSidekiqQueue
 
   def perform(group_ids, provider = nil)
-    return unless Gitlab::LDAP::Config.enabled_extras?
+    return unless Gitlab::LDAP::Config.enabled? && ::License.feature_available?(:ldap_group_sync)
 
     groups = Group.where(id: Array(group_ids))
 

app/workers/ldap_sync_worker.rb

@@ -3,7 +3,7 @@ class LdapSyncWorker
   include CronjobQueue
 
   def perform
-    return unless Gitlab::LDAP::Config.enabled_extras?
+    return unless Gitlab::LDAP::Config.enabled? && ::License.feature_available?(:ldap_group_sync)
 
     Rails.logger.info "Performing daily LDAP sync task."
     User.ldap.find_each(batch_size: 100).each do |ldap_user|

ee/app/views/groups/ee/_settings_nav.html.haml

-- if Gitlab::LDAP::Config.enabled_extras? && can?(current_user, :admin_ldap_group_links, @group)
+- if Gitlab::LDAP::Config.enabled? && ::License.feature_available?(:ldap_group_sync) && can?(current_user, :admin_ldap_group_links, @group)
   = nav_link(path: 'ldap_group_links#index') do
     = link_to group_ldap_group_links_path(@group), title: 'LDAP Group' do
       %span

ee/lib/ee/gitlab/ldap/config.rb

-module EE
-  module Gitlab
-    module LDAP
-      module Config
-        extend ActiveSupport::Concern
-
-        class_methods do
-          def enabled_extras?
-            enabled? && ::License.feature_available?(:ldap_extras)
-          end
-        end
-      end
-    end
-  end
-end

lib/api/groups.rb

@@ -213,7 +213,7 @@ module API
 
       desc 'Sync a group with LDAP.'
       post ":id/ldap_sync" do
-        not_found! unless Gitlab::LDAP::Config.enabled_extras?
+        not_found! unless Gitlab::LDAP::Config.enabled? && ::License.feature_available?(:ldap_group_sync)
 
         group = find_group!(params[:id])
         authorize! :admin_group, group

lib/gitlab/ldap/config.rb

@@ -2,8 +2,6 @@
 module Gitlab
   module LDAP
     class Config
-      include ::EE::Gitlab::LDAP::Config
-
       NET_LDAP_ENCRYPTION_METHOD = {
         simple_tls: :simple_tls,
         start_tls:  :start_tls,
@@ -27,7 +25,7 @@ module Gitlab
       def self.available_servers
         return [] unless enabled?
 
-        enabled_extras? ? servers : Array.wrap(servers.first)
+        ::License.feature_available?(:multiple_ldap_servers) ? servers : Array.wrap(servers.first)
       end
 
       def self.providers

spec/requests/api/groups_spec.rb

@@ -700,9 +700,13 @@ describe API::Groups do
   end
 
   describe 'POST /groups/:id/ldap_sync' do
-    context 'when LDAP config enabled_extras is true' do
     before do
-        allow(Gitlab::LDAP::Config).to receive(:enabled_extras?).and_return(true)
+      allow(Gitlab::LDAP::Config).to receive(:enabled?).and_return(true)
+    end
+
+    context 'when the ldap_group_sync feature is available' do
+      before do
+        stub_licensed_features(ldap_group_sync: true)
       end
 
       context 'when authenticated as the group owner' do
@@ -772,9 +776,9 @@ describe API::Groups do
       end
     end
 
-    context 'when LDAP config enabled_extras is false' do
+    context 'when the ldap_group_sync feature is not available' do
       before do
-        allow(Gitlab::LDAP::Config).to receive(:enabled_extras?).and_return(false)
+        stub_licensed_features(ldap_group_sync: false)
       end
 
       it 'returns 404 (same as CE would)' do