Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade steep typechecker to latest version 1.5.3 #3198

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Upgrade steep typechecker to latest version 1.5.3 #3198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6266701
Upgrade steep typechecker to latest version 1.5.3
ivoanjo Oct 10, 2023
7f147ec
fix rule_merger.rbs
GustavoCaso Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ end
group :check do
if RUBY_VERSION >= '3.0.0' && RUBY_PLATFORM != 'java'
gem 'rbs', '~> 3.2.0', require: false
gem 'steep', '~> 1.4.0', require: false
gem 'steep', '~> 1.5.3', require: false
end
end

Expand Down
16 changes: 8 additions & 8 deletions sig/datadog/appsec/processor/rule_merger.rbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ module Datadog

type rules = ::Hash[::String, untyped]
type data = ::Array[::Hash[::String, untyped]]
type overrides = ::Array[::Hash[::String, untyped]]
type exclusions = ::Array[::Hash[::String, untyped]]
type custom_rules = ::Array[::Hash[::String, untyped]]
type overrides = ::Array[::Array[::Hash[::String, untyped]]]
type exclusions = ::Array[::Array[::Hash[::String, untyped]]]
type custom_rules = ::Array[::Array[::Hash[::String, untyped]]]
type processors = ::Array[::Hash[::String, untyped]]
type scanners = ::Array[::Hash[::String, untyped]]

DEFAULT_WAF_PROCESSORS: processors
DEFAULT_WAF_SCANNERS: processors

def self.merge: (rules: ::Array[rules], ?data: ::Array[data], ?overrides: ::Array[overrides], ?exclusions: ::Array[exclusions], ?custom_rules: ::Array[custom_rules], ?processors: processors, ?scanners: scanners) -> rules
def self.merge: (rules: ::Array[rules], ?data: ::Array[data], ?overrides: overrides, ?exclusions: exclusions, ?custom_rules: custom_rules, ?processors: processors, ?scanners: scanners) -> rules

private

def self.combine_rules: (::Array[rules] rules) -> rules

def self.combine_data: (::Array[data] data) -> data?

def self.merge_data_base_on_expiration: (data data1, data data2) -> ::Array[data]
def self.merge_data_base_on_expiration: (data data1, data data2) -> data

def self.combine_overrides: (::Array[overrides] overrides) -> ::Array[overrides]?
def self.combine_overrides: (overrides overrides) -> overrides?

def self.combine_exclusions: (::Array[exclusions] exclusions) -> ::Array[exclusions]?
def self.combine_exclusions: (exclusions exclusions) -> exclusions?

def self.combine_custom_rules: (::Array[custom_rules] custom_rules) -> ::Array[custom_rules]?
def self.combine_custom_rules: (custom_rules custom_rules) -> custom_rules?
end
end
end
Expand Down
Loading