Skip to content

Commit

Permalink
Merge branch '8.17' into mergify/bp/8.17/pr-2889
Browse files Browse the repository at this point in the history
  • Loading branch information
romulets authored Jan 7, 2025
2 parents ccab7f5 + 7512acf commit dd8cea3
Show file tree
Hide file tree
Showing 8 changed files with 160 additions and 58 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ repos:
name: Update rule status
description: Update rule status in rules_table.md
require_serial: true
entry: poetry run -C security-policies python security-policies/dev/update_rule_status.py
entry: poetry run -C security-policies python dev/update_rule_status.py
pass_filenames: false
language: system
files: (.*\.rego|tests\/product\/.*\.py)$
Expand All @@ -164,7 +164,7 @@ repos:
name: Update rule metadata
description: Update rule status in rules_table.md
require_serial: true
entry: poetry run -C security-policies python security-policies/dev/generate_rule_metadata.py
entry: poetry run -C security-policies python dev/generate_rule_metadata.py
pass_filenames: false
language: system
files: (\.rego)$
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ require (
github.com/aws/smithy-go v1.22.1
github.com/dgraph-io/ristretto v0.2.0
github.com/djherbis/times v1.6.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241230063435-e9a656591cf6
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250102161323-5fd5e6553225
github.com/elastic/e2e-testing v1.2.3
github.com/elastic/elastic-agent-autodiscover v0.9.0
github.com/elastic/elastic-agent-client/v7 v7.16.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241230063435-e9a656591cf6 h1:tZTdnM1ZYXZ5bETxzs7/ARty6Uc2P8rxI03B7Gr0EOQ=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241230063435-e9a656591cf6/go.mod h1:qwqHYirqMrBcpuj+wz+J8ZlHHcQ2HhfSV05z+StYr30=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250102161323-5fd5e6553225 h1:pFj0gsAUXPO2IwExT86lv6/fGG6SjJKKfeWV8x80XwA=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250102161323-5fd5e6553225/go.mod h1:uJ6hgePJzDVMK38iHaM8/3LzKYMQvgwdqqfSahNSP/A=
github.com/elastic/e2e-testing v1.2.3 h1:XKF91O+Y6RcrTuNc7kMM4/HE9pvkvjASIYhEWS5XkT0=
github.com/elastic/e2e-testing v1.2.3/go.mod h1:TqP9TlnqFqKqd61etWkYgb8T+RulH7vmhg7lxQw/Yag=
github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
Expand Down
2 changes: 1 addition & 1 deletion scripts/sync_rule_templates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fi

# generate the rule templates
cd ../cloudbeat
poetry run -C security-policies python security-policies/dev/generate_rule_templates.py
poetry run -C security-policies python dev/generate_rule_templates.py

# commit and push the changes
cd ../integrations
Expand Down
38 changes: 34 additions & 4 deletions security-policies/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 22 additions & 20 deletions security-policies/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
[tool.poetry]
[project]
name = "security-policies"
version = "0.1.0"
description = ""
authors = ["oren zohar <[email protected]>"]

[tool.poetry.dependencies]
python = "^3.11"
pandas = "^1.5.2"
GitPython = "^3.1.41"
openpyxl = "^3.0.10"
tabulate = "^0.9.0"
numpy = "^1.23.5"
Jinja2 = "^3.1.4"
regex = "^2022.10.31"
"ruamel.yaml" = "^0.17.21"
PyYAML = "^6.0"
pytest = "^7.4.4"
allure-python-commons = "^2.13.2"
munch = "^4.0.0"
loguru = "^0.7.2"

[tool.poetry.dev-dependencies]
authors = [
{name ="oren zohar", email = "[email protected]"}
]
requires-python = ">=3.11"
dependencies = [
"pandas >= 1.5.2",
"GitPython >= 3.1.41",
"openpyxl >= 3.0.10",
"tabulate >= 0.9.0",
"numpy >= 1.23.5",
"Jinja2 >= 3.1.4",
"regex >= 2022.10.31",
"ruamel.yaml >= 0.17.21",
"PyYAML >= 6.0",
"pytest >= 7.4.4",
"allure-python-commons >= 2.13.2",
"munch >= 4.0.0",
"loguru >= 0.7.2",
]

[tool.poetry]
package-mode = false

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
Loading

0 comments on commit dd8cea3

Please sign in to comment.