chore(release): update v3 with latest changes (#4504)

Co-authored-by: Pepe Fagoaga <pepe@prowler.com>
This commit is contained in:
Sergio Garcia
2024-07-22 11:52:52 -04:00
committed by GitHub
parent c910514ea6
commit aa9fde62b2
5 changed files with 29 additions and 7 deletions
@@ -3894,6 +3894,7 @@
"ap-southeast-3",
"ca-central-1",
"eu-central-1",
"eu-central-2",
"eu-north-1",
"eu-south-1",
"eu-south-2",
@@ -7201,6 +7202,7 @@
"ap-southeast-3",
"ap-southeast-4",
"ca-central-1",
"ca-west-1",
"eu-central-1",
"eu-central-2",
"eu-north-1",
@@ -10,7 +10,7 @@ class ssm_managed_compliant_patching(Check):
report = Check_Report_AWS(self.metadata())
report.region = resource.region
report.resource_id = resource.id
report.resource_arn = resource.arn
if resource.status == ResourceStatus.COMPLIANT:
report.status = "PASS"
report.status_extended = (
@@ -116,13 +116,18 @@ class SSM(AWSService):
for page in list_resource_compliance_summaries_paginator.paginate():
for item in page["ResourceComplianceSummaryItems"]:
resource_id = item["ResourceId"]
resource_status = item["Status"]
resource_arn = f"arn:{self.audited_partition}:ec2:{regional_client.region}:{self.audited_account}:instance/{resource_id}"
if not self.audit_resources or (
is_resource_filtered(resource_arn, self.audit_resources)
):
resource_status = item["Status"]
self.compliance_resources[resource_id] = ComplianceResource(
id=resource_id,
status=resource_status,
region=regional_client.region,
)
self.compliance_resources[resource_id] = ComplianceResource(
id=resource_id,
arn=resource_arn,
status=resource_status,
region=regional_client.region,
)
except Exception as error:
logger.error(
@@ -166,6 +171,7 @@ class ResourceStatus(Enum):
class ComplianceResource(BaseModel):
id: str
arn: str
region: str
status: ResourceStatus
@@ -35,6 +35,7 @@ class Test_ssm_managed_compliant_patching:
ssm_client.compliance_resources = {
instance_id: ComplianceResource(
id="i-1234567890abcdef0",
arn=f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:instance/{instance_id}",
region=AWS_REGION_US_EAST_1,
status=ResourceStatus.COMPLIANT,
)
@@ -55,6 +56,10 @@ class Test_ssm_managed_compliant_patching:
assert len(result) == 1
assert result[0].region == AWS_REGION_US_EAST_1
assert result[0].resource_id == instance_id
assert (
result[0].resource_arn
== f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:instance/{instance_id}"
)
assert result[0].status == "PASS"
assert (
result[0].status_extended
@@ -68,6 +73,7 @@ class Test_ssm_managed_compliant_patching:
ssm_client.compliance_resources = {
instance_id: ComplianceResource(
id="i-1234567890abcdef0",
arn=f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:instance/{instance_id}",
region=AWS_REGION_US_EAST_1,
status=ResourceStatus.NON_COMPLIANT,
)
@@ -88,6 +94,10 @@ class Test_ssm_managed_compliant_patching:
assert len(result) == 1
assert result[0].region == AWS_REGION_US_EAST_1
assert result[0].resource_id == instance_id
assert (
result[0].resource_arn
== f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:instance/{instance_id}"
)
assert result[0].status == "FAIL"
assert (
result[0].status_extended
@@ -196,5 +196,9 @@ class Test_SSM_Service:
assert ssm.compliance_resources
assert ssm.compliance_resources[instance_id]
assert ssm.compliance_resources[instance_id].id == instance_id
assert (
ssm.compliance_resources[instance_id].arn
== f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:instance/{instance_id}"
)
assert ssm.compliance_resources[instance_id].region == AWS_REGION_US_EAST_1
assert ssm.compliance_resources[instance_id].status == ResourceStatus.COMPLIANT