Update fideslang to 1.1.0 (#865)

* [skip ci] changes for fideslang 1.0.0 These initial changes catch up to the proposed state of 1.1.0 (and 1.0.0) by adding the tags values and updating the demo_resources/ * [skip ci] adjust resources * update .fides/ resources for fideslang 1.1.0 * fideslang docs changes * test updates for fideslang changes * clean up further test failures and visualize sort * generzte front end changes * changelog
ethyca · Jul 13, 2022 · 3577f7e · 3577f7e
1 parent 7b6414d
commit 3577f7e
Show file tree

Hide file tree

Showing 38 changed files with 290 additions and 201 deletions.
diff --git a/.fides/dataset.yml b/.fides/dataset.yml
@@ -88,6 +88,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: data_qualifiers
     description: null
     data_categories: null
@@ -150,6 +157,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: data_subjects
     description: null
     data_categories: null
@@ -221,6 +235,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: data_uses
     description: null
     data_categories: null
@@ -319,6 +340,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: datasets
     description: null
     data_categories: null
@@ -385,7 +413,7 @@ dataset:
       description: Encrypted contact information for a joint controller (name, address,
         email, phone)
       data_categories:
-      - user.provided.identifiable.contact
+      - user.contact
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: End of joint controller agreement.
       fields: null
@@ -454,6 +482,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: evaluations
     description: null
     data_categories: null
@@ -526,7 +561,7 @@ dataset:
       description: Encrypted contact information for the controller (name, address,
         email, phone)
       data_categories:
-      - user.provided.identifiable.contact
+      - user.contact
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: 1 Year post-employment
       fields: null
@@ -541,7 +576,7 @@ dataset:
       description: Encrypted contact information for the Data Protection Officer (name,
         address, email, phone)
       data_categories:
-      - user.provided.identifiable.contact
+      - user.contact
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: 1 Year post-employment
       fields: null
@@ -598,7 +633,7 @@ dataset:
       description: Encrypted contact information for the representative (name, address,
         email, phone)
       data_categories:
-      - user.provided.identifiable.contact
+      - user.contact
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: 1 Year post-employment
       fields: null
@@ -616,6 +651,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: policies
     description: null
     data_categories: null
@@ -678,6 +720,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: registries
     description: null
     data_categories: null
@@ -733,6 +782,13 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
   - name: systems
     description: null
     data_categories: null
@@ -800,7 +856,7 @@ dataset:
       description: Encrypted contact information for a joint controller (name, address,
         email, phone)
       data_categories:
-      - user.provided.identifiable.contact
+      - user.contact
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: End of joint controller agreement.
       fields: null
@@ -867,3 +923,10 @@ dataset:
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: null
       fields: null
+    - name: tags
+      description: null
+      data_categories:
+      - system.operations
+      data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      retention: null
+      fields: null
diff --git a/.fides/policy.yml b/.fides/policy.yml
@@ -27,7 +27,6 @@ policy:
     data_categories:
       matches: ANY
       values:
-      - account
       - user
     data_uses:
       matches: ANY

diff --git a/.fides/system.yml b/.fides/system.yml
@@ -12,7 +12,7 @@ system:
   - name: Store system data.
     data_categories:
     - system.operations
-    - user.provided.identifiable.contact
+    - user.contact
     data_use: improve.system
     data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
     data_subjects:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,7 +40,7 @@ The types of changes are:
 * Webserver dependencies now come as a standard part of the package [#881](https://github.com/ethyca/fides/pull/881)
 * Initial configuration wizard UI view
   * Refactored step & form results management to use Redux Toolkit slice.
-* Remove the `obscure` requirement from the `generate` endpoint [#819](https://github.com/ethyca/fides/pull/819)
+* Update `fideslang` to `1.1.0`, simplifying the default taxonomy and adding `tags` for resources [#865](https://github.com/ethyca/fides/pull/865)
 * Remove the `obscure` requirement from the `generate` endpoint [#819](https://github.com/ethyca/fides/pull/819)
 
 ### Docs

diff --git a/clients/admin-ui/src/types/api/models/DataCategory.ts b/clients/admin-ui/src/types/api/models/DataCategory.ts
@@ -14,6 +14,7 @@ export type DataCategory = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/DataQualifier.ts b/clients/admin-ui/src/types/api/models/DataQualifier.ts
@@ -14,6 +14,7 @@ export type DataQualifier = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/DataSubject.ts b/clients/admin-ui/src/types/api/models/DataSubject.ts
@@ -16,6 +16,7 @@ export type DataSubject = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/DataUse.ts b/clients/admin-ui/src/types/api/models/DataUse.ts
@@ -17,6 +17,7 @@ export type DataUse = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/Dataset.ts b/clients/admin-ui/src/types/api/models/Dataset.ts
@@ -18,6 +18,7 @@ export type Dataset = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/Organization.ts b/clients/admin-ui/src/types/api/models/Organization.ts
@@ -19,6 +19,7 @@ export type Organization = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/Policy.ts b/clients/admin-ui/src/types/api/models/Policy.ts
@@ -18,6 +18,7 @@ export type Policy = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/Registry.ts b/clients/admin-ui/src/types/api/models/Registry.ts
@@ -17,6 +17,7 @@ export type Registry = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/clients/admin-ui/src/types/api/models/System.ts b/clients/admin-ui/src/types/api/models/System.ts
@@ -22,6 +22,7 @@ export type System = {
    * Defines the Organization that this resource belongs to.
    */
   organization_fides_key?: string;
+  tags?: Array<string>;
   /**
    * Human-Readable name for this resource.
    */

diff --git a/demo_resources/demo_dataset.yml b/demo_resources/demo_dataset.yml
@@ -26,13 +26,13 @@ dataset:
     - name: email
       description: User's Email
       data_categories:
-      - user.provided.identifiable.contact.email
+      - user.contact.email
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: Account termination
     - name: first_name
       description: User's first name
       data_categories:
-      - user.provided.identifiable.name
+      - user.name
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
       retention: Account termination
     - name: food_preference
@@ -42,10 +42,10 @@ dataset:
     - name: state
       description: User's State
       data_categories:
-      - user.provided.identifiable.contact.state
+      - user.contact.address.state
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
     - name: uuid
       description: User's unique ID
       data_categories:
-      - user.derived.identifiable.unique_id
+      - user.unique_id
       data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
diff --git a/demo_resources/demo_policy.yml b/demo_resources/demo_policy.yml
@@ -8,7 +8,7 @@ policy:
         data_categories:
           matches: ANY
           values:
-            - user.provided.identifiable.contact
+            - user.contact
         data_uses:
           matches: ANY
           values:

diff --git a/demo_resources/demo_system.yml b/demo_resources/demo_system.yml
@@ -15,8 +15,8 @@ system:
     privacy_declarations:
       - name: Analyze customer behaviour for improvements.
         data_categories:
-          - user.provided.identifiable.contact
-          - user.derived.identifiable.device.cookie_id
+          - user.contact
+          - user.device.cookie_id
         data_use: improve.system
         data_subjects:
           - customer
@@ -33,8 +33,8 @@ system:
     privacy_declarations:
       - name: Collect data for marketing
         data_categories:
-          #- user.provided.identifiable.contact # uncomment to add this category to the system
-          - user.derived.identifiable.device.cookie_id
+          #- user.contact # uncomment to add this category to the system
+          - user.device.cookie_id
         data_use: advertising
         data_subjects:
           - customer

diff --git a/docs/fides/docs/guides/policies.md b/docs/fides/docs/guides/policies.md
@@ -46,7 +46,7 @@ policy:
         data_uses:
           matches: OTHER # And the use of the data is something other than...
           values:
-            - provide.system.operations
+            - provide.service.operations
             - improve.system
             - collect
         data_subjects:
@@ -129,8 +129,8 @@ policy:
         data_uses:
           matches: OTHER # And a data use other than these have been declared
           values:
-            - provide.system.operations
-            - provide.system.operations.support
+            - provide.service.operations
+            - provide.service.operations.support
         data_subjects:
           matches: ANY # And the data subject is a customer
           values: