From 0f1d8d8c5cd33466cd3c3618eeaa5d51c0266a6f Mon Sep 17 00:00:00 2001 From: Phil Salant Date: Wed, 21 Sep 2022 14:07:33 -0600 Subject: [PATCH 1/2] Bump fideslang to 1.3.0 (#1103) * Bump fideslang to 1.3.0 * Add `egress` and `ingress` to `ctl_systems` * Update `CHANGELOG.md` --- .fides/dataset.yml | 14 +++++++++++ CHANGELOG.md | 3 +++ requirements.txt | 6 ++--- ...0603d_add_egress_and_ingress_to_systems.py | 25 +++++++++++++++++++ src/fidesctl/api/ctl/sql_models.py | 2 ++ 5 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 src/fidesctl/api/ctl/migrations/versions/6bd93cb0603d_add_egress_and_ingress_to_systems.py diff --git a/.fides/dataset.yml b/.fides/dataset.yml index 54d964d29f..9773f88317 100644 --- a/.fides/dataset.yml +++ b/.fides/dataset.yml @@ -1094,6 +1094,13 @@ dataset: data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified retention: null fields: null + - name: egress + description: null + data_categories: + - system.operations + data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified + retention: null + fields: null - name: fides_key description: null data_categories: @@ -1115,6 +1122,13 @@ dataset: data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified retention: null fields: null + - name: ingress + description: null + data_categories: + - system.operations + data_qualifier: aggregated.anonymized.unlinked_pseudonymized.pseudonymized.identified + retention: null + fields: null - name: joint_controller description: Encrypted contact information for a joint controller (name, address, email, phone) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad6fa41c65..34e232e14e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ The types of changes are: ## [Unreleased](https://github.com/ethyca/fides/compare/1.8.4...main) +## Changed + +* Update fideslang to v1.3.0 [#1103](https://github.com/ethyca/fides/pull/1103) ## [1.8.4](https://github.com/ethyca/fides/compare/1.8.3...1.8.4) - 2022-09-09 diff --git a/requirements.txt b/requirements.txt index 7fae3e8fe4..d47006ce52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,9 +4,9 @@ click>=8.1 colorama>=0.4.3 cryptography>=36 deepdiff==5.8.0 -fastapi==0.77.1 fastapi-pagination[sqlalchemy]==0.9.3 -fideslang==1.2.0 +fastapi==0.77.1 +fideslang==1.3.0 fideslib==3.0.1 fideslog==1.1.5 GitPython==3.1 @@ -19,8 +19,8 @@ pydantic>=1.8.1,<1.10.0 # Required by fastapi PyJWT==2.4.0 pyyaml>=5,<6 requests>=2,<3 -sqlalchemy[asyncio]==1.4.27 SQLAlchemy-Utils==0.38.2 +sqlalchemy[asyncio]==1.4.27 toml>=0.10.1 uvicorn==0.17.6 versioneer==0.19 diff --git a/src/fidesctl/api/ctl/migrations/versions/6bd93cb0603d_add_egress_and_ingress_to_systems.py b/src/fidesctl/api/ctl/migrations/versions/6bd93cb0603d_add_egress_and_ingress_to_systems.py new file mode 100644 index 0000000000..afc08a94d4 --- /dev/null +++ b/src/fidesctl/api/ctl/migrations/versions/6bd93cb0603d_add_egress_and_ingress_to_systems.py @@ -0,0 +1,25 @@ +"""Add egress and ingress to Systems + +Revision ID: 6bd93cb0603d +Revises: 4fc34906c389 +Create Date: 2022-09-21 00:27:35.164295 + +""" +import sqlalchemy as sa +from alembic import op + +# revision identifiers, used by Alembic. +revision = "6bd93cb0603d" +down_revision = "4fc34906c389" +branch_labels = None +depends_on = None + + +def upgrade(): + op.add_column("ctl_systems", sa.Column("egress", sa.JSON())) + op.add_column("ctl_systems", sa.Column("ingress", sa.JSON())) + + +def downgrade(): + op.drop_column("ctl_systems", "egress") + op.drop_column("ctl_systems", "ingress") diff --git a/src/fidesctl/api/ctl/sql_models.py b/src/fidesctl/api/ctl/sql_models.py index 673ee78633..cf28ce8472 100644 --- a/src/fidesctl/api/ctl/sql_models.py +++ b/src/fidesctl/api/ctl/sql_models.py @@ -223,6 +223,8 @@ class System(Base, FidesBase): privacy_declarations = Column(JSON) administrating_department = Column(String) data_protection_impact_assessment = Column(JSON) + egress = Column(JSON) + ingress = Column(JSON) sql_model_map: Dict = { From f38df7dd94092a667aa4fd164d6d580cd2934554 Mon Sep 17 00:00:00 2001 From: Phil Salant Date: Wed, 21 Sep 2022 14:08:35 -0600 Subject: [PATCH 2/2] Prepare 1.8.5 release (#1107) * Bump fideslang to 1.3.0 * Add `egress` and `ingress` to `ctl_systems` * Update `CHANGELOG.md` * Prepare `CHANGELOG.md` for v1.8.5 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34e232e14e..be08120cdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,9 @@ The types of changes are: ## [Unreleased](https://github.com/ethyca/fides/compare/1.8.4...main) -## Changed +## [1.8.5](https://github.com/ethyca/fides/compare/1.8.4...1.8.5) + +### Changed * Update fideslang to v1.3.0 [#1103](https://github.com/ethyca/fides/pull/1103)