From 8966f77f7b4804eb2726f398b925bebd6a4f2ec4 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Wed, 21 Oct 2020 11:51:18 -0700
Subject: [PATCH] Add ldap encrypted credentials to the usage_data

Adds usage_data for instances with ldap encrypted credentials in use
---
 changelogs/unreleased/ldap-encrypted-usage-data.yml | 5 +++++
 lib/gitlab/usage_data.rb                            | 4 +++-
 spec/lib/gitlab/usage_data_spec.rb                  | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/ldap-encrypted-usage-data.yml

diff --git a/changelogs/unreleased/ldap-encrypted-usage-data.yml b/changelogs/unreleased/ldap-encrypted-usage-data.yml
new file mode 100644
index 00000000000000..4cb716167d00fd
--- /dev/null
+++ b/changelogs/unreleased/ldap-encrypted-usage-data.yml
@@ -0,0 +1,5 @@
+---
+title: Add ldap encrypted credentials to the usage data
+merge_request: 48210
+author:
+type: changed
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 7cfe500260a4b3..9179efb95824e4 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -236,7 +236,9 @@ def system_usage_data_license
 
       def system_usage_data_settings
         {
-          settings: {}
+          settings: {
+            ldap_encrypted_secrets_enabled: alt_usage_data(fallback: nil) { Gitlab::Auth::Ldap::Config.encrypted_secrets.active? }
+          }
         }
       end
 
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index a67a6f02aef1bf..7efb2c85386223 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -1038,6 +1038,14 @@ def omniauth_providers
         end
       end
     end
+
+    describe ".system_usage_data_settings" do
+      subject { described_class.system_usage_data_settings }
+
+      it 'gathers settings usage data', :aggregate_failures do
+        expect(subject[:settings][:ldap_encrypted_secrets_enabled]).to eq(Gitlab::Auth::Ldap::Config.encrypted_secrets.active?)
+      end
+    end
   end
 
   describe '.merge_requests_users', :clean_gitlab_redis_shared_state do
-- 
GitLab