regscale-cli 6.21.2.1__py3-none-any.whl → 6.21.2.2__py3-none-any.whl

regscale/_version.py

@@ -33,7 +33,7 @@ def get_version_from_pyproject() -> str:
                     return match.group(1)
     except Exception:
         pass
-    return "6.21.2.1"  # fallback version
+    return "6.21.2.2"  # fallback version
 
 
 __version__ = get_version_from_pyproject()

regscale/integrations/scanner_integration.py

@@ -1742,7 +1742,7 @@ class ScannerIntegration(ABC):
             ).create_or_update()
             logger.debug("Added CWE property %s to issue %s", finding.plugin_id, issue.id)
 
-        if ScannerVariables.useMilestones:
+        if ScannerVariables.useMilestones and issue.id:
             if (
                 existing_issue
                 and existing_issue.status == regscale_models.IssueStatus.Closed
@@ -1754,7 +1754,7 @@ class ScannerIntegration(ABC):
                     responsiblePersonId=self.assessor_id,
                     parentID=issue.id,
                     parentModule="issues",
-                ).create_or_update()
+                ).create()
                 logger.debug("Added milestone for issue %s from finding %s", issue.id, finding.external_id)
             elif (
                 existing_issue
@@ -1767,7 +1767,7 @@ class ScannerIntegration(ABC):
                     responsiblePersonId=self.assessor_id,
                     parentID=issue.id,
                     parentModule="issues",
-                ).create_or_update()
+                ).create()
                 logger.debug("Added milestone for issue %s from finding %s", issue.id, finding.external_id)
             elif not existing_issue:
                 regscale_models.Milestone(
@@ -1776,7 +1776,7 @@ class ScannerIntegration(ABC):
                     responsiblePersonId=self.assessor_id,
                     parentID=issue.id,
                     parentModule="issues",
-                ).create_or_update()
+                ).create()
                 logger.debug("Created milestone for issue %s from finding %s", issue.id, finding.external_id)
             else:
                 logger.debug("No milestone created for issue %s from finding %s", issue.id, finding.external_id)
@@ -2661,7 +2661,7 @@ class ScannerIntegration(ABC):
         issue.dateLastUpdated = get_current_datetime()
         issue.save()
 
-        if ScannerVariables.useMilestones:
+        if ScannerVariables.useMilestones and issue.id:
             regscale_models.Milestone(
                 title=f"Issue closed from {self.title} scan",
                 milestoneDate=issue.dateCompleted,
@@ -2669,7 +2669,7 @@ class ScannerIntegration(ABC):
                 completed=True,
                 parentID=issue.id,
                 parentModule="issues",
-            ).create_or_update()
+            ).create()
             logger.debug("Created milestone for issue %s from %s tool", issue.id, self.title)
 
         with count_lock:

regscale/models/regscale_models/milestone.py

@@ -4,7 +4,7 @@
 
 from typing import Optional
 
-from pydantic import Field, field_validator
+from pydantic import Field, field_validator, model_validator
 
 from regscale.core.app.utils.app_utils import get_current_datetime
 from regscale.models.regscale_models.regscale_model import RegScaleModel
@@ -15,7 +15,7 @@ class Milestone(RegScaleModel):
 
     _module_slug = "milestones"
     _module_string = "milestones"
-    _unique_fields = ["title", "parentID", "parentModule"]
+    _unique_fields = ["title", "parentModule"]
 
     title: str
     id: int = 0
@@ -29,13 +29,30 @@ class Milestone(RegScaleModel):
     parentID: Optional[int] = None
     parentModule: str = ""
 
+    @field_validator("milestoneDate")
+    @classmethod
+    def validate_milestone_date(cls, v: Optional[str]) -> str:
+        """Ensure milestoneDate is never empty."""
+        if not v or v == "":
+            return get_current_datetime()
+        return v
+
     @field_validator("dateCompleted")
     @classmethod
     def set_date_completed(cls, v: Optional[str], info) -> Optional[str]:
         """Set dateCompleted based on completed field."""
         completed = info.data.get("completed", False)
-        if completed and v is None:
+        if completed and (v is None or v == ""):
             return get_current_datetime()
         if not completed:
             return None
         return v
+
+    @model_validator(mode="after")
+    def validate_completion(self):
+        """Ensure dateCompleted is set when completed is True."""
+        if self.completed and (self.dateCompleted is None or self.dateCompleted == ""):
+            self.dateCompleted = get_current_datetime()
+        elif not self.completed:
+            self.dateCompleted = None
+        return self

{regscale_cli-6.21.2.1.dist-info → regscale_cli-6.21.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: regscale-cli
-Version: 6.21.2.1
+Version: 6.21.2.2
 Summary: Command Line Interface (CLI) for bulk processing/loading data into RegScale
 Home-page: https://github.com/RegScale/regscale-cli
 Author: Travis Howerton

{regscale_cli-6.21.2.1.dist-info → regscale_cli-6.21.2.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 regscale/__init__.py,sha256=ZygAIkX6Nbjag1czWdQa-yP-GM1mBE_9ss21Xh__JFc,34
-regscale/_version.py,sha256=aKR5M6GR_hLtq7YS3vSDrCZwuydhT3NwAFRrOjyWNBY,1198
+regscale/_version.py,sha256=c23bJjOSOin3Rj2jQMCSQSWCsJkFOj3c3AkLRqbD5mc,1198
 regscale/regscale.py,sha256=xcxnTwEwWgfO3Fnp0LVo32SZCJzAswq3WDZgm21nHnI,30914
 regscale/airflow/__init__.py,sha256=yMwN0Bz4JbM0nl5qY_hPegxo_O2ilhTOL9PY5Njhn-s,270
 regscale/airflow/click_dags.py,sha256=H3SUR5jkvInNMv1gu-VG-Ja_H-kH145CpQYNalWNAbE,4520
@@ -114,7 +114,7 @@ regscale/integrations/api_paginator_example.py,sha256=lEuYI-xEGcjnXuIzbCobCP0YRu
 regscale/integrations/compliance_integration.py,sha256=aR13rcMh-BTpr_ibENPQZ1z5rlhtuqpPGRI9YfbqJjw,68394
 regscale/integrations/integration_override.py,sha256=HjYBCuvNpU3t3FptaqYAkdexLFOZBAFrFE9xU0RD1Nc,5867
 regscale/integrations/jsonl_scanner_integration.py,sha256=l8nq_T3rE1XX-6HxrNHm3xzxCNWbIjxQvGMdtZWs7KQ,57003
-regscale/integrations/scanner_integration.py,sha256=JpRr7LgzOdRdrncJ-wJrypgUTVWZ1j3Jbhl0zrNMvts,145540
+regscale/integrations/scanner_integration.py,sha256=o7RdZ7Z0x0Ldhh5JrjUx1qFGKiJLw_y-6mFyhyA2P1k,145526
 regscale/integrations/variables.py,sha256=MfQ34WuYVN5437A9sZ2ssHRkA3gFhMHfk1DVasceGmY,2336
 regscale/integrations/commercial/__init__.py,sha256=LZj1qV5f7RdHIOfedDVELV62ADe5gyNccWayHMF1aVc,14026
 regscale/integrations/commercial/ad.py,sha256=YXSmK8vRf6yi2GnREGa5GrE6GelhFrLj44SY8AO1pK0,15509
@@ -415,7 +415,7 @@ regscale/models/regscale_models/line_of_inquiry.py,sha256=Uu0lQEhif0W6yTSkJo27Gy
 regscale/models/regscale_models/link.py,sha256=lAY4Ig3Menm1EqfcAbVJ7jsCsRO5tWtJIf-9-G9FXT8,6593
 regscale/models/regscale_models/master_assessment.py,sha256=t03-8vQJ7hnPNgEU0GSC1XGKOgAqHKuIupbt5IjJvtI,7322
 regscale/models/regscale_models/meta_data.py,sha256=Fg8rrWSTx3K00QkF4glH9UdY9OFWJ4_UqxleLSSbx8I,2482
-regscale/models/regscale_models/milestone.py,sha256=Mzf1BqG5S4a-EmgiXu8oqY8ssV7oSfgeknPI3_eINv0,1295
+regscale/models/regscale_models/milestone.py,sha256=HiBdx1uzasl3Crb03j9qdowCHUy93nTOuklLs_V2SSM,1943
 regscale/models/regscale_models/module.py,sha256=a7lalHmVTQ04ZILnJxuFWdHYDtyusBMTtonD4ICL-Wc,7272
 regscale/models/regscale_models/modules.py,sha256=yeva_tct88o2NFt93_zmqUcXZ3LucVbAv5FvQPru3cQ,8551
 regscale/models/regscale_models/objective.py,sha256=aJIpmkZ-NscqV2y8SGB4HYzm615b6mklyHnW9bL2ljk,249
@@ -533,9 +533,9 @@ tests/regscale/models/test_regscale_model.py,sha256=ZsrEZkC4EtdIsoQuayn1xv2gEGcV
 tests/regscale/models/test_report.py,sha256=IqUq7C__a1_q_mLaz0PE9Lq6fHggBsB14-AzEYNBxLw,4666
 tests/regscale/models/test_tenable_integrations.py,sha256=PNJC2Zu6lv1xj7y6e1yOsz5FktSU3PRKb5x3n5YG3w0,4072
 tests/regscale/models/test_user_model.py,sha256=e9olv28qBApgnvK6hFHOgXjUC-pkaV8aGDirEIWASL4,4427
-regscale_cli-6.21.2.1.dist-info/LICENSE,sha256=ytNhYQ9Rmhj_m-EX2pPq9Ld6tH5wrqqDYg-fCf46WDU,1076
-regscale_cli-6.21.2.1.dist-info/METADATA,sha256=u5fjU9V_avvh2jOU8-hXgxc-mHhkPM1gZvz65X3GI78,34955
-regscale_cli-6.21.2.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-regscale_cli-6.21.2.1.dist-info/entry_points.txt,sha256=cLOaIP1eRv1yZ2u7BvpE3aB4x3kDrDwkpeisKOu33z8,269
-regscale_cli-6.21.2.1.dist-info/top_level.txt,sha256=Uv8VUCAdxRm70bgrD4YNEJUmDhBThad_1aaEFGwRByc,15
-regscale_cli-6.21.2.1.dist-info/RECORD,,
+regscale_cli-6.21.2.2.dist-info/LICENSE,sha256=ytNhYQ9Rmhj_m-EX2pPq9Ld6tH5wrqqDYg-fCf46WDU,1076
+regscale_cli-6.21.2.2.dist-info/METADATA,sha256=7yq5fry5SL1DvzcbSeD18IguQQoEOpA6s7lHM2nR2zA,34955
+regscale_cli-6.21.2.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+regscale_cli-6.21.2.2.dist-info/entry_points.txt,sha256=cLOaIP1eRv1yZ2u7BvpE3aB4x3kDrDwkpeisKOu33z8,269
+regscale_cli-6.21.2.2.dist-info/top_level.txt,sha256=Uv8VUCAdxRm70bgrD4YNEJUmDhBThad_1aaEFGwRByc,15
+regscale_cli-6.21.2.2.dist-info/RECORD,,