Merge branch 'main' into dependabot/npm_and_yarn/clients/sample-app/p…

…ostcss-and-next-8.4.31
ethyca · Mar 14, 2024 · d2d4b56 · d2d4b56
2 parents 10dc075 + 92c9f52
commit d2d4b56
Show file tree

Hide file tree

Showing 557 changed files with 22,483 additions and 21,744 deletions.
diff --git a/.fides/db_dataset.yml b/.fides/db_dataset.yml
diff --git a/.fides/policies.yml b/.fides/policies.yml
@@ -17,5 +17,4 @@ policy:
     data_subjects:
       matches: ANY
       values:
-      - customer
-    data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
+      - customer
diff --git a/.fides/redis_dataset.yml b/.fides/redis_dataset.yml
@@ -7,12 +7,10 @@ dataset:
         fields:
           - name: EN_ACCESS_GRAPH__<privacy_request_id>
             description: This graph is summarized and sent to Fideslog to create high level insight into how graphs change between retries to inform future features.
-            data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
             fidesops_meta:
               data_type: object # Stores an encrypted representation of the fidesops graph that executes the privacy requests.
             fields:
               - name: <dataset_name>:<collection_name>  # The current collection
-                data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
                 fidesops_meta:
                   data_type: object
                 fields:
@@ -22,12 +20,10 @@ dataset:
                       data_type: string[]  # List of edges between the upstream collection and the current collection
           - name: EN_DATA_USE_MAP__<privacy_request_id>
             description: This map of traversed `Collection`s to associated `DataUse`s is stored and retrieved to be included in access request output packages.
-            data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
             fidesops_meta:
               data_type: object # Dict mapping `Collection` addresses -> set of associated `DataUse`s
             fields:
               - name: <dataset_name>:<collection_name>  # `Collection` address
-                data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
                 data_categories: [system.operations]
                 fidesops_meta:
                   data_type: string[] # set of `DataUse`s associated with this `Collection`

diff --git a/.fides/systems.yml b/.fides/systems.yml
@@ -6,13 +6,6 @@ system:
     description: Privacy annotations as code.
     system_type: Service
     # RoPA Info - these need to exist to pass an audit
-    data_responsibility_title: Controller
-    data_protection_impact_assessment:
-      is_required: false
-      progress: null
-      link: null
-    joint_controller: null
-    third_country_transfers: null
     administrating_department: Not defined
     # Privacy Declarations 
     privacy_declarations:
@@ -21,7 +14,6 @@ system:
           - system.operations
           - user.contact
         data_use: functional.service.improve
-        data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         data_subjects:
           - anonymous_user
         dataset_references:
@@ -34,13 +26,6 @@ system:
     description: Privacy request fufillment.
     system_type: Application
     # RoPA Info - these need to exist to pass an audit
-    data_responsibility_title: Controller
-    data_protection_impact_assessment:
-      is_required: false
-      progress: null
-      link: null
-    joint_controller: null
-    third_country_transfers: null
     administrating_department: Not defined
     # Privacy Declarations
     privacy_declarations:
@@ -49,7 +34,6 @@ system:
         data_use: essential.service
         data_subjects:
           - customer
-        data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         dataset_references:
           - fides_db
           - fides_cache
@@ -61,13 +45,6 @@ system:
     description: Fides administration UI.
     system_type: Application
     # RoPA Info - these need to exist to pass an audit
-    data_responsibility_title: Controller
-    data_protection_impact_assessment:
-      is_required: false
-      progress: null
-      link: null
-    joint_controller: null
-    third_country_transfers: null
     administrating_department: Not defined
     # Privacy Declarations
     privacy_declarations:
@@ -76,7 +53,6 @@ system:
         data_use: essential.service
         data_subjects:
           - employee
-        data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
         dataset_references:
           - fides_db
           # Specific tables for reference

diff --git a/.github/workflows/backend_checks.yml b/.github/workflows/backend_checks.yml
@@ -9,10 +9,11 @@ on:
   push:
     branches:
       - "main"
+      - "release-**"
 
 env:
   IMAGE: ethyca/fides:local
-  DEFAULT_PYTHON_VERSION: "3.10.12"
+  DEFAULT_PYTHON_VERSION: "3.10.13"
 
 jobs:
   ###############
@@ -41,7 +42,7 @@ jobs:
     strategy:
       matrix:
         # NOTE: These are the currently supported/tested Python Versions
-        python_version: ["3.8.17", "3.9.17", "3.10.12"]
+        python_version: ["3.8.18", "3.9.18", "3.10.13"]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -221,7 +222,7 @@ jobs:
     needs: Check-Container-Startup
     strategy:
       matrix:
-        python_version: ["3.8.17", "3.9.17", "3.10.12"]
+        python_version: ["3.8.18", "3.9.18", "3.10.13"]
         test_selection:
           - "ctl-not-external"
           - "ops-unit"
@@ -272,7 +273,7 @@ jobs:
     strategy:
       max-parallel: 1 # This prevents collisions in shared external resources
       matrix:
-        python_version: ["3.8.17", "3.9.17", "3.10.12"]
+        python_version: ["3.8.18", "3.9.18", "3.10.13"]
     runs-on: ubuntu-latest
     timeout-minutes: 20
     # In PRs run with the "unsafe" label, or run on a "push" event to main
@@ -312,7 +313,7 @@ jobs:
     strategy:
       max-parallel: 1 # This prevents collisions in shared external resources
       matrix:
-        python_version: ["3.8.17", "3.9.17", "3.10.12"]
+        python_version: ["3.8.18", "3.9.18", "3.10.13"]
     runs-on: ubuntu-latest
     timeout-minutes: 20
     # In PRs run with the "unsafe" label, or run on a "push" event to main
@@ -367,7 +368,7 @@ jobs:
     strategy:
       max-parallel: 1 # This prevents collisions in shared external resources
       matrix:
-        python_version: ["3.8.17", "3.9.17", "3.10.12"]
+        python_version: ["3.8.18", "3.9.18", "3.10.13"]
     steps:
       - name: Download container
         uses: actions/download-artifact@v3

diff --git a/.github/workflows/cli_checks.yml b/.github/workflows/cli_checks.yml
@@ -12,9 +12,10 @@ on:
   push:
     branches:
       - "main"
+      - "release-**"
 
 env:
-  DEFAULT_PYTHON_VERSION: "3.10.12"
+  DEFAULT_PYTHON_VERSION: "3.10.13"
 
 jobs:
   # Basic smoke test of a local install of the fides Python CLI

diff --git a/.github/workflows/cypress_e2e.yml b/.github/workflows/cypress_e2e.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - "main"
+      - "release-**"
 
 env:
   CI: true

diff --git a/.github/workflows/frontend_checks.yml b/.github/workflows/frontend_checks.yml
@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - "main"
+      - "release-**"
 
 env:
   CI: true
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
       push:
         branches:
           - "main"
+          - "release-**"
     env:
       CI: true
@@ Expand Down @@