diff --git a/lib/datadog/core/remote/client/capabilities.rb b/lib/datadog/core/remote/client/capabilities.rb index a60f5edd05b..f704b52760c 100644 --- a/lib/datadog/core/remote/client/capabilities.rb +++ b/lib/datadog/core/remote/client/capabilities.rb @@ -23,7 +23,7 @@ def initialize(settings) private def register(settings) - if settings.appsec.enabled + if settings.respond_to?(:appsec) && settings.appsec.enabled register_capabilities(Datadog::AppSec::Remote.capabilities) register_products(Datadog::AppSec::Remote.products) register_receivers(Datadog::AppSec::Remote.receivers) diff --git a/spec/datadog/core/remote/client/capabilities_spec.rb b/spec/datadog/core/remote/client/capabilities_spec.rb index ae6aaf62579..2799a52e600 100644 --- a/spec/datadog/core/remote/client/capabilities_spec.rb +++ b/spec/datadog/core/remote/client/capabilities_spec.rb @@ -11,54 +11,74 @@ capabilities end - context 'when no component enabled' do - let(:settings) do - appsec_settings = Datadog::AppSec::Configuration::Settings.new - dsl = Datadog::AppSec::Configuration::DSL.new - dsl.enabled = false - appsec_settings.merge(dsl) + context 'AppSec component' do + context 'when disabled' do + let(:settings) do + appsec_settings = Datadog::AppSec::Configuration::Settings.new + dsl = Datadog::AppSec::Configuration::DSL.new + dsl.enabled = false + appsec_settings.merge(dsl) - settings = Datadog::Core::Configuration::Settings.new - expect(settings).to receive(:appsec).at_least(:once).and_return(appsec_settings) + settings = Datadog::Core::Configuration::Settings.new + expect(settings).to receive(:appsec).at_least(:once).and_return(appsec_settings) - settings - end + settings + end - it 'does not register any capabilities, products, and receivers' do - expect(capabilities.capabilities).to be_empty - expect(capabilities.products).to be_empty - expect(capabilities.receivers).to be_empty - end + it 'does not register any capabilities, products, and receivers' do + expect(capabilities.capabilities).to be_empty + expect(capabilities.products).to be_empty + expect(capabilities.receivers).to be_empty + end - describe '#base64_capabilities' do - it 'returns an empty string' do - expect(capabilities.base64_capabilities).to eq('') + describe '#base64_capabilities' do + it 'returns an empty string' do + expect(capabilities.base64_capabilities).to eq('') + end end end - end - context 'when a component enabled' do - let(:settings) do - appsec_settings = Datadog::AppSec::Configuration::Settings.new - dsl = Datadog::AppSec::Configuration::DSL.new - dsl.enabled = true - appsec_settings.merge(dsl) + context 'when not present' do + let(:settings) do + double(Datadog::Core::Configuration) + end - settings = Datadog::Core::Configuration::Settings.new - expect(settings).to receive(:appsec).and_return(appsec_settings) + it 'does not register any capabilities, products, and receivers' do + expect(capabilities.capabilities).to be_empty + expect(capabilities.products).to be_empty + expect(capabilities.receivers).to be_empty + end - settings + describe '#base64_capabilities' do + it 'returns an empty string' do + expect(capabilities.base64_capabilities).to eq('') + end + end end - it 'register capabilities, products, and receivers' do - expect(capabilities.capabilities).to_not be_empty - expect(capabilities.products).to_not be_empty - expect(capabilities.receivers).to_not be_empty - end + context 'when enabled' do + let(:settings) do + appsec_settings = Datadog::AppSec::Configuration::Settings.new + dsl = Datadog::AppSec::Configuration::DSL.new + dsl.enabled = true + appsec_settings.merge(dsl) + + settings = Datadog::Core::Configuration::Settings.new + expect(settings).to receive(:appsec).and_return(appsec_settings) + + settings + end + + it 'register capabilities, products, and receivers' do + expect(capabilities.capabilities).to_not be_empty + expect(capabilities.products).to_not be_empty + expect(capabilities.receivers).to_not be_empty + end - describe '#base64_capabilities' do - it 'returns binary capabilities' do - expect(capabilities.base64_capabilities).to eq('/A==') + describe '#base64_capabilities' do + it 'returns binary capabilities' do + expect(capabilities.base64_capabilities).to eq('/A==') + end end end end