build(deps-dev): bump moto from 4.1.5 to 4.1.6 (#2164)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pepe Fagoaga <pepe@verica.io>
This commit is contained in:
dependabot[bot]
2023-04-05 12:31:58 +02:00
committed by GitHub
parent dcb893e230
commit 434cf94657
4 changed files with 37 additions and 15 deletions

16
poetry.lock generated
View File

@@ -1414,14 +1414,14 @@ test = ["pytest", "pytest-cov"]
[[package]]
name = "moto"
version = "4.1.5"
version = "4.1.6"
description = ""
category = "dev"
optional = false
python-versions = ">=3.7"
files = [
{file = "moto-4.1.5-py2.py3-none-any.whl", hash = "sha256:363577f7a0cdf639852420f6ba5caa9aa3c90a688feae6315f8ee4bf324b8c27"},
{file = "moto-4.1.5.tar.gz", hash = "sha256:63542b7b9f307b00fae460b42d15cf9346de3ad3b1287fba38fc68f3c05e4da4"},
{file = "moto-4.1.6-py2.py3-none-any.whl", hash = "sha256:cfe398a1f6e317d061c47c3d2dd8c6893f3eb49154984a7cbb8bcd4ba517d67d"},
{file = "moto-4.1.6.tar.gz", hash = "sha256:fdcc2731212ca050a28b2bc83e87628294bcbd55cb4f4c4692f972023fb1e7e6"},
]
[package.dependencies]
@@ -1436,13 +1436,13 @@ werkzeug = ">=0.5,<2.2.0 || >2.2.0,<2.2.1 || >2.2.1"
xmltodict = "*"
[package.extras]
all = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.2.8)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"]
all = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.2.8)", "py-partiql-parser (==0.1.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"]
apigateway = ["PyYAML (>=5.1)", "ecdsa (!=0.15)", "openapi-spec-validator (>=0.2.8)", "python-jose[cryptography] (>=3.1.0,<4.0.0)"]
apigatewayv2 = ["PyYAML (>=5.1)"]
appsync = ["graphql-core"]
awslambda = ["docker (>=3.0.0)"]
batch = ["docker (>=3.0.0)"]
cloudformation = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.2.8)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"]
cloudformation = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.2.8)", "py-partiql-parser (==0.1.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"]
cognitoidp = ["ecdsa (!=0.15)", "python-jose[cryptography] (>=3.1.0,<4.0.0)"]
ds = ["sshpubkeys (>=3.1.0)"]
dynamodb = ["docker (>=3.0.0)"]
@@ -1454,8 +1454,8 @@ eks = ["sshpubkeys (>=3.1.0)"]
glue = ["pyparsing (>=3.0.7)"]
iotdata = ["jsondiff (>=1.1.2)"]
route53resolver = ["sshpubkeys (>=3.1.0)"]
s3 = ["PyYAML (>=5.1)"]
server = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "flask (!=2.2.0,!=2.2.1)", "flask-cors", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.2.8)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"]
s3 = ["PyYAML (>=5.1)", "py-partiql-parser (==0.1.0)"]
server = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "flask (!=2.2.0,!=2.2.1)", "flask-cors", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.2.8)", "py-partiql-parser (==0.1.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"]
ssm = ["PyYAML (>=5.1)"]
xray = ["aws-xray-sdk (>=0.93,!=0.96)", "setuptools"]
@@ -2844,4 +2844,4 @@ docs = ["mkdocs", "mkdocs-material"]
[metadata]
lock-version = "2.0"
python-versions = "^3.9"
content-hash = "b67a2ff88c5d5e8b39d4be9279d2f7dbd689a12d4582382bd2ea817059f232e7"
content-hash = "56f617ddd8a800d53179955550c4d73cc4fcb0e9a1652c789d4ec7eddb814fb1"

View File

@@ -57,7 +57,7 @@ coverage = "7.2.2"
docker = "6.0.1"
flake8 = "6.0.0"
freezegun = "1.2.2"
moto = "4.1.5"
moto = "4.1.6"
openapi-spec-validator = "0.5.6"
pylint = "2.17.2"
pytest = "7.2.2"

View File

@@ -1,11 +1,22 @@
from unittest import mock
from boto3 import client, resource
from mock import patch
from moto import mock_ec2
AWS_REGION = "us-east-1"
def mock_generate_regional_clients(service, audit_info):
regional_client = audit_info.audit_session.client(service, region_name=AWS_REGION)
regional_client.region = AWS_REGION
return {AWS_REGION: regional_client}
@patch(
"prowler.providers.aws.services.ec2.ec2_service.generate_regional_clients",
new=mock_generate_regional_clients,
)
class Test_ec2_ebs_public_snapshot:
@mock_ec2
def test_ec2_default_snapshots(self):
@@ -28,7 +39,7 @@ class Test_ec2_ebs_public_snapshot:
result = check.execute()
# Default snapshots
assert len(result) == 1124
assert len(result) == 564
@mock_ec2
def test_ec2_public_snapshot(self):
@@ -62,7 +73,7 @@ class Test_ec2_ebs_public_snapshot:
results = check.execute()
# Default snapshots + 1 created
assert len(results) == 1125
assert len(results) == 565
for snap in results:
if snap.resource_id == snapshot.id:
@@ -103,7 +114,7 @@ class Test_ec2_ebs_public_snapshot:
results = check.execute()
# Default snapshots + 1 created
assert len(results) == 1125
assert len(results) == 565
for snap in results:
if snap.resource_id == snapshot.id:

View File

@@ -1,11 +1,22 @@
from unittest import mock
from boto3 import resource
from mock import patch
from moto import mock_ec2
AWS_REGION = "us-east-1"
def mock_generate_regional_clients(service, audit_info):
regional_client = audit_info.audit_session.client(service, region_name=AWS_REGION)
regional_client.region = AWS_REGION
return {AWS_REGION: regional_client}
@patch(
"prowler.providers.aws.services.ec2.ec2_service.generate_regional_clients",
new=mock_generate_regional_clients,
)
class Test_ec2_ebs_snapshots_encrypted:
@mock_ec2
def test_ec2_default_snapshots(self):
@@ -28,7 +39,7 @@ class Test_ec2_ebs_snapshots_encrypted:
result = check.execute()
# Default snapshots
assert len(result) == 1124
assert len(result) == 564
@mock_ec2
def test_ec2_unencrypted_snapshot(self):
@@ -56,7 +67,7 @@ class Test_ec2_ebs_snapshots_encrypted:
results = check.execute()
# Default snapshots + 1 created
assert len(results) == 1125
assert len(results) == 565
for snap in results:
if snap.resource_id == snapshot.id:
@@ -97,7 +108,7 @@ class Test_ec2_ebs_snapshots_encrypted:
results = check.execute()
# Default snapshots + 1 created
assert len(results) == 1125
assert len(results) == 565
for snap in results:
if snap.resource_id == snapshot.id: