From 09b62740c2811fe979c3b2a12aecff3fd6bfaa52 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Fri, 1 Nov 2024 09:33:54 -0400 Subject: [PATCH] lint --- lib/datadog/core/configuration/agent_settings_resolver.rb | 4 ++-- .../core/configuration/agent_settings_resolver_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/datadog/core/configuration/agent_settings_resolver.rb b/lib/datadog/core/configuration/agent_settings_resolver.rb index fab5c874aa7..7d7c048f553 100644 --- a/lib/datadog/core/configuration/agent_settings_resolver.rb +++ b/lib/datadog/core/configuration/agent_settings_resolver.rb @@ -240,7 +240,7 @@ def should_use_uds? def mixed_http_and_uds return @mixed_http_and_uds if defined?(@mixed_http_and_uds) - + @mixed_http_and_uds = (configured_hostname || configured_port) && can_use_uds? if @mixed_http_and_uds warn_if_configuration_mismatch( @@ -256,7 +256,7 @@ def mixed_http_and_uds ] ) end - + @mixed_http_and_uds end diff --git a/spec/datadog/core/configuration/agent_settings_resolver_spec.rb b/spec/datadog/core/configuration/agent_settings_resolver_spec.rb index adc2b645569..ef2a6766ea1 100644 --- a/spec/datadog/core/configuration/agent_settings_resolver_spec.rb +++ b/spec/datadog/core/configuration/agent_settings_resolver_spec.rb @@ -192,7 +192,7 @@ it 'logs a warning including the uds path' do expect(logger).to receive(:warn) - .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) + .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) # rubocop:disable Style/edundantRegexpCharacterClass resolver end @@ -207,7 +207,7 @@ it 'logs a warning including the uds configuration' do expect(logger).to receive(:warn) - .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) + .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) # rubocop:disable Style/edundantRegexpCharacterClass resolver end @@ -239,7 +239,7 @@ it 'logs a warning including the uds configuration' do expect(logger).to receive(:warn) - .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) + .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) # rubocop:disable Style/edundantRegexpCharacterClass resolver end @@ -254,7 +254,7 @@ it 'logs a warning including the uds configuration' do expect(logger).to receive(:warn) - .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) + .with(%r{Configuration mismatch.*Using "unix:[\/]{1,3}some/path"}) # rubocop:disable Style/edundantRegexpCharacterClass resolver end