Skip to content

Commit

Permalink
Merge branch 'main' into flower-poc
Browse files Browse the repository at this point in the history
  • Loading branch information
galvana authored Feb 2, 2025
2 parents 6879802 + c4d69cc commit d86c7c8
Show file tree
Hide file tree
Showing 397 changed files with 14,352 additions and 4,810 deletions.
2 changes: 2 additions & 0 deletions .fides/db_dataset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2227,6 +2227,8 @@ dataset:
data_categories: [system]
- name: user_assigned_data_categories
data_categories: [system]
- name: data_uses
data_categories: [system]
- name: fides_user_invite
fields:
- name: created_at
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Closes #<issue>
Closes [<issue>]

### Description Of Changes

Expand Down
63 changes: 22 additions & 41 deletions .github/workflows/backend_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,43 +75,6 @@ jobs:
path: /tmp/python-${{ matrix.python_version }}.tar
retention-days: 1

###################
## Static Checks ##
###################
Static-Checks:
strategy:
matrix:
session_name:
[
'"isort(check)"',
'"black(check)"',
"mypy",
"pylint",
"xenon",
"check_install",
'"pytest(nox)"',
]
runs-on: ubuntu-latest
continue-on-error: true
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Install Nox
run: pip install nox>=2022

- name: Install Dev Requirements
run: pip install -r dev-requirements.txt

- name: Run Static Check
run: nox -s ${{ matrix.session_name }}

##################
## Performance ##
##################
Expand Down Expand Up @@ -321,6 +284,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Install Nox
run: pip install nox>=2022

Expand Down Expand Up @@ -361,7 +330,7 @@ jobs:
matrix:
python_version: ["3.9.18", "3.10.13"]
runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 30
# In PRs run with the "unsafe" label, or run on a "push" event to main
if: contains(github.event.pull_request.labels.*.name, 'run unsafe ci checks') || github.event_name == 'push'
steps:
Expand All @@ -377,6 +346,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Install Nox
run: pip install nox>=2022

Expand Down Expand Up @@ -463,12 +438,18 @@ jobs:
- name: Load image
run: docker load --input /tmp/python-${{ matrix.python_version }}.tar

- name: Install Nox
run: pip install nox>=2022

- name: Checkout
uses: actions/checkout@v4

- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Install Nox
run: pip install nox>=2022

- name: Get Vault Token
uses: hashicorp/[email protected]
with:
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/cypress_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ env:
# Docker auth with read-only permissions.
DOCKER_USER: ${{ secrets.DOCKER_USER }}
DOCKER_RO_TOKEN: ${{ secrets.DOCKER_RO_TOKEN }}
DEFAULT_PYTHON_VERSION: "3.10.13"

jobs:
Cypress-E2E:
Expand All @@ -26,6 +27,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Install Nox
run: pip install nox>=2022

Expand Down Expand Up @@ -63,3 +70,9 @@ jobs:

- name: Teardown
run: nox -s teardown

- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-videos-cypress-e2e
path: /home/runner/work/fides/fides/clients/cypress-e2e/cypress/videos/*.mp4
8 changes: 7 additions & 1 deletion .github/workflows/publish_docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ env:
# Docker auth with read-write (publish) permissions. Set as env in workflow root as auth is required in multiple jobs.
DOCKER_USER: ${{ secrets.DOCKER_USER }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
DEFAULT_PYTHON_VERSION: "3.10.13"

jobs:
ParseTags:
Expand Down Expand Up @@ -71,6 +72,12 @@ jobs:
with:
fetch-depth: 0 # This is required to properly tag images

- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Login to DockerHub
uses: docker/login-action@v3
with:
Expand Down Expand Up @@ -104,7 +111,6 @@ jobs:
if: needs.ParseTags.outputs.alpha_tag == 'true' || needs.ParseTags.outputs.beta_tag == 'true'
run: nox -s "push(${{ matrix.application }},prerelease)" -- git_tag


NotifyRedeploy:
runs-on: ubuntu-latest
needs: Push
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/publish_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
env:
TAG: ${{ github.event.release.tag_name }}
PROD_PUBLISH: true
DEFAULT_PYTHON_VERSION: "3.10.13"

jobs:
publish_docs:
Expand All @@ -19,9 +20,11 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-python@v5
- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Echo the Release Tag
run: echo ${{ env.TAG }}
Expand All @@ -31,7 +34,7 @@ jobs:

- name: Install Docs Requirements
run: pip install -r docs/fides/requirements.txt

- name: Install fides
run: pip install -e ./[all]

Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/static_checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Backend Static Code Checks

on:
pull_request:
push:
branches:
- "main"
- "release-**"

env:
IMAGE: ethyca/fides:local
DEFAULT_PYTHON_VERSION: "3.10.13"
# Docker auth with read-only permissions.
DOCKER_USER: ${{ secrets.DOCKER_USER }}
DOCKER_RO_TOKEN: ${{ secrets.DOCKER_RO_TOKEN }}

jobs:
###################
## Static Checks ##
###################
Static-Checks:
strategy:
matrix:
session_name:
[
'"isort(check)"',
'"black(check)"',
"mypy",
"pylint",
"xenon",
"check_install",
'"pytest(nox)"',
]
runs-on: ubuntu-latest
continue-on-error: true
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set Up Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
cache: "pip"

- name: Install Nox
run: pip install nox>=2022

- name: Install Dev Requirements
run: pip install -r dev-requirements.txt

- name: Run Static Check
run: nox -s ${{ matrix.session_name }}
51 changes: 50 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,60 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
- https://github.com/ethyca/fides/labels/high-risk: to indicate that a change is a "high-risk" change that could potentially lead to unanticipated regressions or degradations
- https://github.com/ethyca/fides/labels/db-migration: to indicate that a given change includes a DB migration

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

### Changed
- Added frequency field to DataHubSchema integration config [#5716](https://github.com/ethyca/fides/pull/5716)

### Fixed
- Fixed Bigquery flakey tests. [#5713](LJ-278-fix-failed-big-query-enterprise-tests)

## [2.53.0](https://github.com/ethyca/fides/compare/2.53.0...2.54.0)

### Added
- Migration to add the `data_uses` column to `stagedresource` table, prereqs for Data Catalog work in Fidesplus [#5600](https://github.com/ethyca/fides/pull/5600/) https://github.com/ethyca/fides/labels/db-migration
- Added a new endpoint to fully resubmit any errored privacy requests [#5658](https://github.com/ethyca/fides/pull/5658) https://github.com/ethyca/fides/labels/db-migration

### Changed
- Updated UI colors to new brand. Update logo, homepage cards. [#5668](https://github.com/ethyca/fides/pull/5668)
- Privacy request status tags colors have been updated [#5699](https://github.com/ethyca/fides/pull/5699)
- The privacy declarations for a system are now sorted alphabetically by name. [#5683](https://github.com/ethyca/fides/pull/5683)
- Upgraded GPP library to `3.1.5` and added support for all available state sections (ustx, usde, usia, etc.) [#5696](https://github.com/ethyca/fides/pull/5696)
- Updating DSR execution to allow collections to be unreachable when they don't contain policy-relevant data categories [#5689](https://github.com/ethyca/fides/pull/5689)
- Added "All activity" root breadcrumb to D&D results tables [#5694](https://github.com/ethyca/fides/pull/5694)

### Developer Experience
- Migrated radio buttons and groups to Ant Design [#5681](https://github.com/ethyca/fides/pull/5681)

### Fixed
- Updating mongodb connectors so it can support usernames and password with URL encoded characters [#5682](https://github.com/ethyca/fides/pull/5682)
- After creating a new system, the url is now updated correctly to the new system edit page [#5701](https://github.com/ethyca/fides/pull/5701)
- Visual fixes for table header buttons [#5693](https://github.com/ethyca/fides/pull/5693)

## [2.53.0](https://github.com/ethyca/fides/compare/2.52.0...2.53.0)

### Added
- Added Action Center MVP behind new feature flag [#5622](https://github.com/ethyca/fides/pull/5622)
- Added Data Catalog MVP behind new feature flag [#5628](https://github.com/ethyca/fides/pull/5628)
- Added cache-clearing methods to the `DBCache` model to allow deleting cache entries [#5629](https://github.com/ethyca/fides/pull/5629)
- Adds partitioning, custom identities, multiple identities to test coverage for BigQuery Enterprise [#5618](https://github.com/ethyca/fides/pull/5618)
- Added Datahub groundwork required by Fidesplus [#5666](https://github.com/ethyca/fides/pull/5666)

### Changed
- Updated brand link url [#5656](https://github.com/ethyca/fides/pull/5656)
- Changed "Reclassify" D&D button to show in an overflow menu when row actions are overcrowded [#5655](https://github.com/ethyca/fides/pull/5655)
- Removed primary key requirements for BigQuery and Postgres erasures [#5591](https://github.com/ethyca/fides/pull/5591)
- Updated `DBCache` model so setting cache value always updates the updated_at field [#5669](https://github.com/ethyca/fides/pull/5669)
- Changed sizes of buttons in table headers [#5654](https://github.com/ethyca/fides/pull/5654)
- Adds new config for max number of rows in DSR download through Admin-UI [#5671](https://github.com/ethyca/fides/pull/5671)
- Added CSS variable to FidesJS: `--fides-base-font-size: 16px` for better consistency. Overriding this variable with "1rem" will mimic legacy behavior. [#5673](https://github.com/ethyca/fides/pull/5673) https://github.com/ethyca/fides/labels/high-risk

### Fixed
- Fixed issue where the custom report "reset" button was not working as expected [#5649](https://github.com/ethyca/fides/pull/5649)
- Fixed column ordering issue in the Data Map report [#5649](https://github.com/ethyca/fides/pull/5649)
- Fixed issue where the Data Map report filter dialog was missing an Accordion item label [#5649](https://github.com/ethyca/fides/pull/5649)
- Improved database session management for long running access request tasks [#5667](https://github.com/ethyca/fides/pull/5667)
- Ensured decode_password function properly handles plaintext but valid base64 passwords [#5698](https://github.com/ethyca/fides/pull/5698)

## [2.52.0](https://github.com/ethyca/fides/compare/2.51.2...2.52.0)

Expand Down Expand Up @@ -173,6 +221,7 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o

### Fixed
- API router sanitizer being too aggressive with NextJS Catch-all Segments [#5438](https://github.com/ethyca/fides/pull/5438)
- Fix rendering of subfield names in D&D tables [#5439](https://github.com/ethyca/fides/pull/5439)
- Fix BigQuery `partitioning` queries to properly support multiple identity clauses [#5432](https://github.com/ethyca/fides/pull/5432)

## [2.48.0](https://github.com/ethyca/fides/compare/2.47.1...2.48.0)
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/components/MainSideNav.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
NavConfigGroup,
} from "~/features/common/nav/v2/nav-config";

const ACTIVE_BACKGROUND_COLOR = "rgb(119, 69, 240)";
const ACTIVE_BACKGROUND_COLOR = "rgb(206, 202, 194)";
const INACTIVE_BACKGROUND_COLOR = "rgba(0, 0, 0, 0)";

const selectLinkColor = (title: string) =>
Expand Down
Loading

0 comments on commit d86c7c8

Please sign in to comment.