remove registry construct

mkdocs/docs/resources/dataset.md

@@ -4,11 +4,10 @@ A Dataset takes a database schema (tables and columns) and adds Fides privacy ca
 
   ```
   organization
-    |-> registry (optional)
-        |-> system
-            |-> ** dataset **
-                |-> collections
-                    |-> fields
+    |-> system
+        |-> ** dataset **
+            |-> collections
+                |-> fields
   ```
 
 * The schema is represented as a set of "collections" (tables) that contain "fields" (columns). These can also be arbitrarily nested to handle document-type databases (e.g., NoSQL or S3).

mkdocs/docs/resources/system.md

@@ -4,9 +4,8 @@ A System is a model for describing anything that processes data for your organiz
 
   ```
   organization
-    |-> registry (optional)
-        |-> ** system **
-            |-> privacy declarations
+    |-> ** system **
+        |-> privacy declarations
   ```
 
 ## Object Structure

mkdocs/mkdocs.yml

@@ -16,7 +16,6 @@ nav:
       - Resources:
           - Organization: resources/organization.md
           - Policy: resources/policy.md
-          - Registry: resources/registry.md
           - System: resources/system.md
           - Dataset: resources/dataset.md
   - About Ethyca: https://ethyca.github.io/fides/ethyca/

src/fideslang/__init__.py

@@ -42,7 +42,6 @@
     PolicyRule,
     PrivacyDeclaration,
     PrivacyRule,
-    Registry,
     System,
     Taxonomy,
 )
@@ -55,7 +54,6 @@
     "dataset": Dataset,
     "organization": Organization,
     "policy": Policy,
-    "registry": Registry,
     "system": System,
     "evaluation": Evaluation,
 }

src/fideslang/models.py

@@ -771,15 +771,6 @@ class Policy(FidesModel):
     )
 
 
-# Registry
-class Registry(FidesModel):
-    """
-    The Registry resource model.
-
-    Systems can be assigned to this resource, but it doesn't inherently
-    point to any other resources.
-    """
-
 
 # System
 class DataProtectionImpactAssessment(BaseModel):
@@ -962,9 +953,6 @@ class System(FidesModel):
     Describes an application and includes a list of PrivacyDeclaration resources.
     """
 
-    registry_id: Optional[int] = Field(
-        description="The id of the system registry, if used.",
-    )
     meta: Optional[Dict] = meta_field
     fidesctl_meta: Optional[SystemMetadata] = Field(
         description=SystemMetadata.__doc__,
@@ -1132,5 +1120,4 @@ class Taxonomy(BaseModel):
     system: Optional[List[System]] = Field(default_factory=list)
     policy: Optional[List[Policy]] = Field(default_factory=list)
 
-    registry: Optional[List[Registry]] = Field(default_factory=list)
     organization: List[Organization] = Field(default_factory=list)

tests/conftest.py

@@ -86,16 +86,8 @@ def resources_dict():
             data_uses=models.PrivacyRule(matches="NONE", values=["provide.system"]),
             data_subjects=models.PrivacyRule(matches="ANY", values=[]),
         ),
-        "registry": models.Registry(
-            organization_fides_key=1,
-            fides_key="test_registry",
-            name="Test Registry",
-            description="Test Regsitry",
-            systems=[],
-        ),
         "system": models.System(
             organization_fides_key=1,
-            registryId=1,
             fides_key="test_system",
             system_type="SYSTEM",
             name="Test System",

tests/fideslang/test_models.py

@@ -117,7 +117,6 @@ def test_system_valid(self) -> None:
                     ],
                 )
             ],
-            registry_id=1,
             system_type="SYSTEM",
             tags=["some", "tags"],
         )
@@ -164,7 +163,6 @@ def test_system_valid_nested_meta(self) -> None:
                     name="declaration-name",
                 )
             ],
-            registry_id=1,
             system_type="SYSTEM",
             tags=["some", "tags"],
         )
@@ -200,7 +198,6 @@ def test_system_valid_no_meta(self) -> None:
                     name="declaration-name",
                 )
             ],
-            registry_id=1,
             system_type="SYSTEM",
             tags=["some", "tags"],
         )
@@ -221,7 +218,6 @@ def test_system_valid_no_egress_or_ingress(self) -> None:
                     name="declaration-name",
                 )
             ],
-            registry_id=1,
             system_type="SYSTEM",
             tags=["some", "tags"],
         )
@@ -251,7 +247,6 @@ def test_system_no_egress(self) -> None:
                         name="declaration-name",
                     )
                 ],
-                registry_id=1,
                 system_type="SYSTEM",
                 tags=["some", "tags"],
             )
@@ -281,7 +276,6 @@ def test_system_no_ingress(self) -> None:
                         name="declaration-name",
                     )
                 ],
-                registry_id=1,
                 system_type="SYSTEM",
                 tags=["some", "tags"],
             )
@@ -309,7 +303,6 @@ def test_system_user_ingress_valid(self) -> None:
                     name="declaration-name",
                 )
             ],
-            registry_id=1,
             system_type="SYSTEM",
             tags=["some", "tags"],
         )
@@ -321,7 +314,6 @@ def test_expanded_system(self):
             tags=["some", "tags"],
             name="Exponential Interactive, Inc d/b/a VDX.tv",
             description="My system test",
-            registry_id=1,
             meta={"some": "meta stuff"},
             system_type="SYSTEM",
             egress=[

tests/fideslang/test_validation.py

@@ -430,7 +430,6 @@ def test_valid_policy():
 def test_create_valid_system():
     System(
         organization_fides_key=1,
-        registryId=1,
         fides_key="test_system",
         system_type="SYSTEM",
         name="Test System",