diff --git a/demo_resources/demo_registry.yml b/demo_resources/demo_registry.yml deleted file mode 100644 index 7d4658e..0000000 --- a/demo_resources/demo_registry.yml +++ /dev/null @@ -1,4 +0,0 @@ -registry: - - fides_key: demo_registry - name: Demo Registry - description: Demo Registry diff --git a/mkdocs/docs/resources/dataset.md b/mkdocs/docs/resources/dataset.md index 1a2a20c..0ed04a2 100644 --- a/mkdocs/docs/resources/dataset.md +++ b/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). diff --git a/mkdocs/docs/resources/registry.md b/mkdocs/docs/resources/registry.md deleted file mode 100644 index 2adc7cc..0000000 --- a/mkdocs/docs/resources/registry.md +++ /dev/null @@ -1,53 +0,0 @@ -# Registry - -A Registry is a collection of System resources. You may add a System to a Registry by setting the System's `registry_id` field. - - ``` - organization - |-> ** registry ** (optional) - |-> system - ``` - -* A System may belong to only one Registry. - -* All Registries are siblings: You cannot create a hierarchy of Registries. -* Collecting your systems into Registries is optional. - -## Object Structure - -**fides_key**     _constrained string_ - -A string token of your own invention that uniquely identifies this Registry. It's your responsibility to ensure that the value is unique across all of your Registry objects. The value may only contain alphanumeric characters, underscores, and hyphens. (`[A-Za-z0-9_.-]`). - -**name**     _string_ - -A UI-friendly label for the Registry. - -**description**     _string_ - -A human-readable description of the Registry. - -**organization_fides_key**     _string_     default: `default_organization` - -The fides key of the [Organization](../../resources/organization/) to which this Registry belongs. - -## Examples - -### **Manifest File** - -```yaml -registry: - - fides_key: user_systems_registry - name: User Systems Registry - description: A Registry for all of the user-related systems. -``` - -### **API Payload** - -```json -{ - "fides_key": "user_systems_registry", - "name": "User Systems Registry", - "description": "A Registry for all of the user-related systems." -} -``` diff --git a/mkdocs/docs/resources/system.md b/mkdocs/docs/resources/system.md index f5e457e..f23d574 100644 --- a/mkdocs/docs/resources/system.md +++ b/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 diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml index a76f02b..21b0bbb 100644 --- a/mkdocs/mkdocs.yml +++ b/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/ diff --git a/src/fideslang/__init__.py b/src/fideslang/__init__.py index 9d18a52..8d4eb75 100644 --- a/src/fideslang/__init__.py +++ b/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, } diff --git a/src/fideslang/models.py b/src/fideslang/models.py index 52c5fe7..8a97598 100644 --- a/src/fideslang/models.py +++ b/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) diff --git a/tests/conftest.py b/tests/conftest.py index 89a099f..6dbebc9 100644 --- a/tests/conftest.py +++ b/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", diff --git a/tests/fideslang/test_models.py b/tests/fideslang/test_models.py index cc65d01..9441527 100644 --- a/tests/fideslang/test_models.py +++ b/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=[ diff --git a/tests/fideslang/test_validation.py b/tests/fideslang/test_validation.py index 156a726..2131083 100644 --- a/tests/fideslang/test_validation.py +++ b/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",