From 5fcfcd53aa96248f8e43e92924bcab9cd39c9e10 Mon Sep 17 00:00:00 2001
From: Sergio Garcia <38561120+sergargar@users.noreply.github.com>
Date: Tue, 20 Jun 2023 14:22:13 +0200
Subject: [PATCH] fix(compliance): remove unnecessary Optional attributes
 (#2514)

---
 prowler/lib/check/compliance_models.py | 40 +++++++++++++-------------
 prowler/lib/outputs/models.py          |  4 +--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/prowler/lib/check/compliance_models.py b/prowler/lib/check/compliance_models.py
index a5eba76a..7836482d 100644
--- a/prowler/lib/check/compliance_models.py
+++ b/prowler/lib/check/compliance_models.py
@@ -39,10 +39,10 @@ class ENS_Requirements_Tipos(str, Enum):
 class ENS_Requirements(BaseModel):
     """ENS V3 Framework Requirements"""
 
-    IdGrupoControl: Optional[str]
-    Marco: Optional[str]
-    Categoria: Optional[str]
-    DescripcionControl: Optional[str]
+    IdGrupoControl: str
+    Marco: str
+    Categoria: str
+    DescripcionControl: str
     Tipo: ENS_Requirements_Tipos
     Nivel: ENS_Requirements_Nivel
     Dimensiones: list[ENS_Requirements_Dimensiones]
@@ -78,31 +78,31 @@ class CIS_Requirements_AssessmentStatus(str):
 class CIS_Requirements(BaseModel):
     """CIS Requirements"""
 
-    Section: Optional[str]
+    Section: str
     Profile: CIS_Requirements_Profile
     AssessmentStatus: CIS_Requirements_AssessmentStatus
-    Description: Optional[str]
-    RationaleStatement: Optional[str]
-    ImpactStatement: Optional[str]
-    RemediationProcedure: Optional[str]
-    AuditProcedure: Optional[str]
-    AdditionalInformation: Optional[str]
-    References: Optional[str]
+    Description: str
+    RationaleStatement: str
+    ImpactStatement: str
+    RemediationProcedure: str
+    AuditProcedure: str
+    AdditionalInformation: str
+    References: str
 
 
 # Well Architected Requirements
 class AWS_Well_Architected_Requirements(BaseModel):
     """AWS Well Architected Requirements"""
 
-    Name: Optional[str]
-    WellArchitectedQuestionId: Optional[str]
-    WellArchitectedPracticeId: Optional[str]
-    Section: Optional[str]
+    Name: str
+    WellArchitectedQuestionId: str
+    WellArchitectedPracticeId: str
+    Section: str
     SubSection: Optional[str]
-    LevelOfRisk: Optional[str]
-    AssessmentMethod: Optional[str]
-    Description: Optional[str]
-    ImplementationGuidanceUrl: Optional[str]
+    LevelOfRisk: str
+    AssessmentMethod: str
+    Description: str
+    ImplementationGuidanceUrl: str
 
 
 # Base Compliance Model
diff --git a/prowler/lib/outputs/models.py b/prowler/lib/outputs/models.py
index 47a60024..343b4dd7 100644
--- a/prowler/lib/outputs/models.py
+++ b/prowler/lib/outputs/models.py
@@ -575,9 +575,9 @@ class Check_Output_CSV_AWS_Well_Architected(BaseModel):
     AssessmentDate: str
     Requirements_Attributes_Name: str
     Requirements_Attributes_WellArchitectedQuestionId: str
-    Requirements_Attributes_WellArchitectedPracticeId: Optional[str]
+    Requirements_Attributes_WellArchitectedPracticeId: str
     Requirements_Attributes_Section: str
-    Requirements_Attributes_SubSection: str
+    Requirements_Attributes_SubSection: Optional[str]
     Requirements_Attributes_LevelOfRisk: str
     Requirements_Attributes_AssessmentMethod: str
     Requirements_Attributes_Description: str