Skip to content

Commit

Permalink
Merge tag 'tags/1.8.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasLaPiana committed Sep 21, 2022
2 parents 568067d + f38df7d commit d47c7c3
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 4 deletions.
14 changes: 14 additions & 0 deletions .fides/dataset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The types of changes are:
* `Fixed` for any bug fixes.
* `Security` in case of vulnerabilities.

## [Unreleased](https://github.com/ethyca/fides/compare/1.8.4...main)
## [Unreleased](https://github.com/ethyca/fides/compare/1.8.5...main)

### Added

Expand All @@ -40,6 +40,12 @@ The types of changes are:

* Fixed the "help" link in the UI header [#1078](https://github.com/ethyca/fides/pull/1078)

## [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)

## [1.8.4](https://github.com/ethyca/fides/compare/1.8.3...1.8.4) - 2022-09-09

### Added
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 2 additions & 0 deletions src/fidesctl/api/ctl/sql_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit d47c7c3

Please sign in to comment.