Commit 4f35e055 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'ldap-encrypted-usage-data' into 'master'

Add ldap encrypted credentials to the usage_data

See merge request gitlab-org/gitlab!48210
parents bb8a6477 8966f77f
---
title: Add ldap encrypted credentials to the usage data
merge_request: 48210
author:
type: changed
...@@ -236,7 +236,9 @@ module Gitlab ...@@ -236,7 +236,9 @@ module Gitlab
def system_usage_data_settings def system_usage_data_settings
{ {
settings: {} settings: {
ldap_encrypted_secrets_enabled: alt_usage_data(fallback: nil) { Gitlab::Auth::Ldap::Config.encrypted_secrets.active? }
}
} }
end end
......
...@@ -1038,6 +1038,14 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do ...@@ -1038,6 +1038,14 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
end end
end 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 end
describe '.merge_requests_users', :clean_gitlab_redis_shared_state do describe '.merge_requests_users', :clean_gitlab_redis_shared_state do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment