Skip to content

Commit

Permalink
Merge branch 'main' into heap-access-soundarya
Browse files Browse the repository at this point in the history
  • Loading branch information
galvana committed Jul 19, 2023
2 parents 3caf8f5 + d6d8121 commit 9422bf4
Show file tree
Hide file tree
Showing 590 changed files with 10,977 additions and 3,283 deletions.
183 changes: 183 additions & 0 deletions .fides/db_dataset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,10 @@ dataset:
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: active
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: ctl_data_qualifiers
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
fields:
Expand Down Expand Up @@ -419,6 +423,10 @@ dataset:
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: active
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: ctl_data_subjects
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
fields:
Expand Down Expand Up @@ -470,6 +478,10 @@ dataset:
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: active
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: ctl_data_uses
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
fields:
Expand Down Expand Up @@ -536,6 +548,10 @@ dataset:
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: active
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: ctl_datasets
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
fields:
Expand Down Expand Up @@ -2204,6 +2220,10 @@ dataset:
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: served_notice_history_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: userregistration
description: 'Records the registration status of this Fides deployment'
data_categories: null
Expand Down Expand Up @@ -2240,4 +2260,167 @@ dataset:
description: 'The name of the organization this Fides deployment belongs to'
data_categories:
- user.workplace
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: cookies
description: 'Fides Generated Description for Table: cookies'
data_categories: []
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
fields:
- name: created_at
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: domain
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: name
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: path
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: privacy_declaration_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: system_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: updated_at
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: lastservednotice
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
fields:
- name: created_at
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: fides_user_device_provided_identity_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: privacy_notice_history_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: privacy_notice_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: provided_identity_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: served_notice_history_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: updated_at
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: servednoticehistory
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
fields:
- name: acknowledge_mode
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: anonymized_ip_address
data_categories:
- user
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: created_at
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: updated_at
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: email
data_categories:
- user
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: fides_user_device
data_categories:
- user
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: fides_user_device_provided_identity_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: hashed_email
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: hashed_fides_user_device
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: hashed_phone_number
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: phone_number
data_categories:
- user
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: privacy_experience_config_history_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: privacy_experience_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: privacy_notice_history_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: provided_identity_id
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: request_origin
data_categories:
- user
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: serving_component
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: updated_at
description: 'Fides Generated Description for Column: updated_at'
data_categories: [ ]
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: url_recorded
data_categories:
- system.operations
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: user_agent
data_categories:
- user
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
- name: user_geography
data_categories:
- user
data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified
11 changes: 11 additions & 0 deletions .fides/redis_dataset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ dataset:
data_categories: [system.operations]
fidesops_meta:
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`
- name: EN_EMAIL_INFORMATION__<privacy_request_id>__<current_step>__<dataset_name>__<collection_name> # Usage: For building emails associated with email-connector datasets at the end of the privacy request. This encrypted raw information is retrieved from each relevant email-based collection and used to build a single email per email connector, with instructions on how to mask data on the given dataset.
fidesops_meta:
data_type: object # Stores how to locate and mask records for a given "email" collection.
Expand Down
9 changes: 5 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Closes #<issue>

### Description Of Changes

_Write some things here about the changes and any potential caveats_


### Code Changes

* [ ] _list your code changes here_
Expand All @@ -18,7 +23,3 @@ Closes #<issue>
* [ ] Relevant Follow-Up Issues Created
* [ ] Update `CHANGELOG.md`
* [ ] For API changes, the [Postman collection](https://github.com/ethyca/fides/blob/main/docs/fides/docs/development/postman/Fides.postman_collection.json) has been updated

### Description Of Changes

_Write some things here about the changes and any potential caveats_
16 changes: 8 additions & 8 deletions .github/workflows/backend_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

env:
IMAGE: ethyca/fides:local
DEFAULT_PYTHON_VERSION: "3.10.11"
DEFAULT_PYTHON_VERSION: "3.10.12"

jobs:
###############
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
matrix:
# NOTE: These are the currently supported/tested Python Versions
python_version: ["3.8.16", "3.9.16", "3.10.11"]
python_version: ["3.8.17", "3.9.17", "3.10.12"]
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
needs: Check-Container-Startup
strategy:
matrix:
python_version: ["3.8.16", "3.9.16", "3.10.11"]
python_version: ["3.8.17", "3.9.17", "3.10.12"]
test_selection:
- "ctl-not-external"
- "ops-unit"
Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
strategy:
max-parallel: 1 # This prevents collisions in shared external resources
matrix:
python_version: ["3.8.16", "3.9.16", "3.10.11"]
python_version: ["3.8.17", "3.9.17", "3.10.12"]
runs-on: ubuntu-latest
timeout-minutes: 20
# In PRs run with the "unsafe" label, or run on a "push" event to main
Expand All @@ -260,8 +260,8 @@ jobs:
env:
SNOWFLAKE_FIDESCTL_PASSWORD: ${{ secrets.SNOWFLAKE_FIDESCTL_PASSWORD }}
REDSHIFT_FIDESCTL_PASSWORD: ${{ secrets.REDSHIFT_FIDESCTL_PASSWORD }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_FIDESCTL_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_FIDESCTL_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CTL_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CTL_SECRET_ACCESS_KEY }}
OKTA_CLIENT_TOKEN: ${{ secrets.OKTA_FIDESCTL_CLIENT_TOKEN }}
AWS_DEFAULT_REGION: us-east-1
BIGQUERY_CONFIG: ${{ secrets.BIGQUERY_CONFIG }}
Expand All @@ -274,7 +274,7 @@ jobs:
strategy:
max-parallel: 1 # This prevents collisions in shared external resources
matrix:
python_version: ["3.8.16", "3.9.16", "3.10.11"]
python_version: ["3.8.17", "3.9.17", "3.10.12"]
runs-on: ubuntu-latest
timeout-minutes: 20
# In PRs run with the "unsafe" label, or run on a "push" event to main
Expand Down Expand Up @@ -320,7 +320,7 @@ jobs:
strategy:
max-parallel: 1 # This prevents collisions in shared external resources
matrix:
python_version: ["3.8.16", "3.9.16", "3.10.11"]
python_version: ["3.8.17", "3.9.17", "3.10.12"]
steps:
- name: Download container
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cli_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- "main"

env:
DEFAULT_PYTHON_VERSION: "3.10.11"
DEFAULT_PYTHON_VERSION: "3.10.12"

jobs:
# Basic smoke test of a local install of the fides Python CLI
Expand Down
Loading

0 comments on commit 9422bf4

Please sign in to comment.