lib/datadog/appsec/configuration/settings.rb in ddtrace-1.11.1 vs lib/datadog/appsec/configuration/settings.rb in ddtrace-1.12.0
- old
+ new
@@ -114,11 +114,11 @@
'DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP' => [:obfuscator_key_regex, Settings.string],
'DD_APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP' => [:obfuscator_value_regex, Settings.string],
}.freeze
# Struct constant whisker cast for Steep
- Integration = _ = Struct.new(:integration, :options) # rubocop:disable Naming/ConstantName
+ Integration = _ = Struct.new(:integration) # rubocop:disable Naming/ConstantName
def initialize
@integrations = []
# Stores which options have been configured using Datadog.configure block or ENV variables
@configured = Set.new
@@ -179,18 +179,10 @@
def obfuscator_value_regex
# Cast for Steep
_ = @options[:obfuscator_value_regex]
end
- def [](integration_name)
- integration = Datadog::AppSec::Contrib::Integration.registry[integration_name]
-
- raise ArgumentError, "'#{integration_name}' is not a valid integration." unless integration
-
- integration.options
- end
-
def merge(dsl)
dsl.options.each do |k, v|
unless v.nil?
@options[k] = v
@configured << k
@@ -201,10 +193,10 @@
# patcher.patch may call configure again, hence merge might be called again so it needs to be reentrant
dsl.instruments.each do |instrument|
# TODO: error handling
registered_integration = Datadog::AppSec::Contrib::Integration.registry[instrument.name]
- @integrations << Integration.new(registered_integration, instrument.options)
+ @integrations << Integration.new(registered_integration)
# TODO: move to a separate apply step
klass = registered_integration.klass
if klass.loaded? && klass.compatible?
instance = klass.new