more cleanup on lookup object.

remove confidence, impact, and risk_score
from the tags field in prep for integration
with the RBA changes PR

Author: pyth0n1c

contentctl/objects/detection_tags.py

@@ -41,12 +41,6 @@ class DetectionTags(BaseModel):
     analytic_story: list[Story] = Field(...)
     asset_type: AssetType = Field(...)
     group: list[str] = []
-    confidence: NonNegativeInt = Field(...,le=100)
-    impact: NonNegativeInt = Field(...,le=100)
-    @computed_field
-    @property
-    def risk_score(self) -> int:
-        return round((self.confidence * self.impact)/100)
 
     @computed_field
     @property
@@ -80,9 +74,6 @@ def severity(self)->RiskSeverity:
 
     # enrichment
     mitre_attack_enrichments: List[MitreAttackEnrichment] = Field([], validate_default=True)
-    confidence_id: Optional[PositiveInt] = Field(None, ge=1, le=3)
-    impact_id: Optional[PositiveInt] = Field(None, ge=1, le=5)
-    evidence_str: Optional[str] = None
 
     @computed_field
     @property

contentctl/objects/lookup.py

@@ -131,7 +131,10 @@ def app_filename(self)->FilePath:
         2. Only apply the datetime stamp if it is version > 1.  This makes the code a small fraction
         more complicated, but preserves longstanding CSV that have not been modified in a long time
         '''
-        return pathlib.Path(f"{self.filename.stem}_{self.date.year}{self.date.month:02}{self.date.day:02}.{self.lookup_type}") #type: ignore
+        if self.version > 1:
+            return pathlib.Path(f"{self.filename.stem}.{self.lookup_type}") #type: ignore
+        else: 
+            return pathlib.Path(f"{self.filename.stem}_{self.date.year}{self.date.month:02}{self.date.day:02}.{self.lookup_type}") #type: ignore
 
 class CSVLookup(FileBackedLookup):
     lookup_type:Literal[Lookup_Type.csv]
@@ -187,15 +190,14 @@ def ensure_correct_csv_structure(self)->Self:
 
 class KVStoreLookup(Lookup):
     lookup_type: Literal[Lookup_Type.kvstore]
-    collection: str = Field(description="Name of the KVStore Collection. Note that collection MUST equal the name. This is a duplicate field, so it will be removed eventually.")
     fields: list[str] = Field(description="The names of the fields/headings for the KVStore.", min_length=1)
 
-
-    @model_validator(mode="after")
-    def validate_collection(self)->Self:
-        if self.collection != self.name:
-            raise ValueError("Collection MUST be the same as Name of the lookup, but they do not match")
-        return self
+    @field_validator("fields", mode='after')
+    @classmethod
+    def ensure_key(cls, values: list[str]):
+        if values[0] != "_key":
+            raise ValueError(f"fields MUST begin with '_key', not '{values[0]}'")
+        return values
 
     @model_serializer
     def serialize_model(self):