test updates for fideslang changes

ethyca · Jul 12, 2022 · 56fcc58 · 56fcc58
1 parent 2f85a4f
commit 56fcc58
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 34 deletions.
diff --git a/src/fidesapi/routes/datamap.py b/src/fidesapi/routes/datamap.py
@@ -45,7 +45,7 @@
                             "system.data_protection_impact_assessment.link": "https://example.org/analytics_system_data_protection_impact_assessment",
                             "dataset.source_name": "N/A",
                             "third_country_combined": "GBR, USA, CAN",
-                            "unioned_data_categories": "user.provided.identifiable.contact",
+                            "unioned_data_categories": "user.contact",
                             "dataset.retention": "N/A",
                             "system.joint_controller": "",
                             "system.third_country_safeguards": "",

diff --git a/tests/cli/test_cli.py b/tests/cli/test_cli.py
@@ -121,7 +121,7 @@ def test_audit(test_config_path: str, test_cli_runner: CliRunner) -> None:
 def test_get(test_config_path: str, test_cli_runner: CliRunner) -> None:
     result = test_cli_runner.invoke(
         cli,
-        ["-f", test_config_path, "get", "data_category", "user.provided.identifiable"],
+        ["-f", test_config_path, "get", "data_category", "user"],
     )
     print(result.output)
     assert result.exit_code == 0

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -74,8 +74,8 @@ def resources_dict() -> Generator:
     ] = {
         "data_category": models.DataCategory(
             organization_fides_key=1,
-            fides_key="user.provided.identifiable.custom",
-            parent_key="user.provided.identifiable",
+            fides_key="user.custom",
+            parent_key="user",
             name="Custom Data Category",
             description="Custom Data Category",
         ),
@@ -103,16 +103,14 @@ def resources_dict() -> Generator:
                             name="First_Name",
                             description="A First Name Field",
                             path="another.path",
-                            data_categories=["user.provided.identifiable.name"],
+                            data_categories=["user.name"],
                             data_qualifier="aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified",
                         ),
                         models.DatasetField(
                             name="Email",
                             description="User's Email",
                             path="another.another.path",
-                            data_categories=[
-                                "user.provided.identifiable.contact.email"
-                            ],
+                            data_categories=["user.contact.email"],
                             data_qualifier="aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified",
                         ),
                     ],
@@ -150,7 +148,7 @@ def resources_dict() -> Generator:
         "policy_rule": models.PolicyRule(
             name="Test Policy",
             data_categories=models.PrivacyRule(matches="NONE", values=[]),
-            data_uses=models.PrivacyRule(matches="NONE", values=["provide.system"]),
+            data_uses=models.PrivacyRule(matches="NONE", values=["provide.service"]),
             data_subjects=models.PrivacyRule(matches="ANY", values=[]),
             data_qualifier="aggregated.anonymized.unlinked_pseudonymized.pseudonymized",
         ),

diff --git a/tests/core/test_evaluate.py b/tests/core/test_evaluate.py
@@ -111,7 +111,7 @@ def test_populate_referenced_keys_recursively(test_config: FidesctlConfig) -> No
                         PrivacyDeclaration(
                             name="privacy_declaration_1",
                             data_categories=["account.contact.email"],
-                            data_use="provide.system",
+                            data_use="provide.service",
                             data_qualifier="aggregated.anonymized",
                             data_subjects=["customer"],
                         )
@@ -132,7 +132,7 @@ def test_populate_referenced_keys_recursively(test_config: FidesctlConfig) -> No
     )
 
     populated_data_uses = [data_use.fides_key for data_use in result_taxonomy.data_use]
-    assert sorted(populated_data_uses) == sorted(["provide.system", "provide"])
+    assert sorted(populated_data_uses) == sorted(["provide.service", "provide"])
 
     populated_qualifiers = [
         data_qualifier.fides_key for data_qualifier in result_taxonomy.data_qualifier
@@ -166,7 +166,7 @@ def test_populate_referenced_keys_fails_missing_keys(
                             PrivacyDeclaration(
                                 name="privacy_declaration_1",
                                 data_categories=["missing.category"],
-                                data_use="provide.system",
+                                data_use="provide.service",
                                 data_qualifier="aggregated.anonymized",
                                 data_subjects=["customer"],
                             )
@@ -207,8 +207,8 @@ def test_hydrate_missing_resources(test_config: FidesctlConfig) -> None:
         headers=test_config.user.request_headers,
         dehydrated_taxonomy=dehydrated_taxonomy,
         missing_resource_keys={
-            "user.provided.identifiable.credentials",
-            "user.provided",
+            "user.credentials",
+            "user",
         },
     )
     assert len(actual_hydrated_taxonomy.data_category) == 3

diff --git a/tests/core/test_export.py b/tests/core/test_export.py
@@ -33,7 +33,7 @@ def test_sample_system_taxonomy() -> Generator:
                             "account.contact.email",
                             "account.contact.name",
                         ],
-                        data_use="provide.system",
+                        data_use="provide.service",
                         data_qualifier="aggregated.anonymized",
                         data_subjects=["customer"],
                         dataset_references=["users_dataset"],
@@ -43,7 +43,7 @@ def test_sample_system_taxonomy() -> Generator:
         ],
         "data_subject": [DataSubject(fides_key="customer", name="customer")],
         "data_use": [
-            DataUse(fides_key="provide.system", name="System", parent_key="provide")
+            DataUse(fides_key="provide.service", name="System", parent_key="provide")
         ],
     }
 

diff --git a/tests/data/failing_dataset_collection_taxonomy.yml b/tests/data/failing_dataset_collection_taxonomy.yml
@@ -6,13 +6,13 @@ dataset:
       - name: users
         description: User's information
             data_categories:
-              - user.provided.identifiable.political_opinion
+              - user.political_opinion
             data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized
         fields:
           - name: First_Name
             description: A First Name Field
             data_categories:
-              - user.provided.identifiable.name
+              - user.name
             data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
 
 system:
@@ -23,7 +23,7 @@ system:
     privacy_declarations:
       - name: Share Political Opinions
         data_categories:
-          - user.provided.identifiable
+          - user
         data_use: advertising
         data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         data_subjects:
@@ -42,7 +42,7 @@ policy:
         data_categories:
           matches: ANY
           values:
-            - user.provided.identifiable.political_opinion
+            - user.political_opinion
         data_uses:
           matches: ANY
           values:

diff --git a/tests/data/failing_dataset_field_taxonomy.yml b/tests/data/failing_dataset_field_taxonomy.yml
@@ -9,12 +9,12 @@ dataset:
           - name: First_Name
             description: A First Name Field
             data_categories:
-              - user.provided.identifiable.name
+              - user.name
             data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
           - name: political_opinion
             description: User's political opinion
             data_categories:
-              - user.provided.identifiable.political_opinion
+              - user.political_opinion
             data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized
 system:
   - fides_key: customer_data_sharing_system
@@ -24,7 +24,7 @@ system:
     privacy_declarations:
       - name: Share Political Opinions
         data_categories:
-          - user.provided.identifiable
+          - user
         data_use: advertising
         data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         data_subjects:
@@ -43,7 +43,7 @@ policy:
         data_categories:
           matches: ANY
           values:
-            - user.provided.identifiable.political_opinion
+            - user.political_opinion
         data_uses:
           matches: ANY
           values:

diff --git a/tests/data/failing_dataset_taxonomy.yml b/tests/data/failing_dataset_taxonomy.yml
@@ -3,7 +3,7 @@ dataset:
     name: Sample DB Dataset
     description: This is a Sample Database Dataset
     data_categories:
-      - user.provided.identifiable.political_opinion
+      - user.political_opinion
     data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized
     collections:
       - name: users
@@ -12,7 +12,7 @@ dataset:
           - name: First_Name
             description: A First Name Field
             data_categories:
-              - user.provided.identifiable.name
+              - user.name
             data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
 
 system:
@@ -23,7 +23,7 @@ system:
     privacy_declarations:
       - name: Share Political Opinions
         data_categories:
-          - user.provided.identifiable
+          - user
         data_use: advertising
         data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         data_subjects:
@@ -42,7 +42,7 @@ policy:
         data_categories:
           matches: ANY
           values:
-            - user.provided.identifiable.political_opinion
+            - user.political_opinion
         data_uses:
           matches: ANY
           values:

diff --git a/tests/data/failing_declaration_taxonomy.yml b/tests/data/failing_declaration_taxonomy.yml
@@ -6,7 +6,7 @@ system:
     privacy_declarations:
       - name: Share Political Opinions
         data_categories:
-          - user.provided.identifiable.political_opinion
+          - user.political_opinion
         data_use: third_party_sharing.payment_processing
         data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         data_subjects:
@@ -23,7 +23,7 @@ policy:
         data_categories:
           matches: ANY
           values:
-            - user.provided
+            - user
         data_uses:
           matches: ANY
           values:

diff --git a/tests/data/failing_nested_dataset.yml b/tests/data/failing_nested_dataset.yml
@@ -27,7 +27,7 @@ system:
     privacy_declarations:
       - name: Mesaure usage of users
         data_categories:
-          - user.derived
+          - user
         data_use: improve.system
         data_subjects:
           - customer
@@ -45,7 +45,7 @@ policy:
         data_categories:
           matches: OTHER
           values:
-            - user.derived
+            - user
         data_uses:
           matches: OTHER
           values:

diff --git a/tests/data/passing_declaration_taxonomy.yml b/tests/data/passing_declaration_taxonomy.yml
@@ -6,7 +6,7 @@ system:
     privacy_declarations:
       - name: Share Political Opinions
         data_categories:
-          - user.provided.identifiable.political_opinion
+          - user.political_opinion
         data_use: third_party_sharing.payment_processing
         data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         data_subjects:
@@ -23,7 +23,7 @@ policy:
         data_categories:
           matches: ANY
           values:
-            - user.provided
+            - user
         data_uses:
           matches: ANY
           values: