Merge branch 'main' into dependabot/pip/cryptography-43.0.1

ethyca · Oct 30, 2024 · f2a42ed · f2a42ed
2 parents 79b17c3 + 6db9bbc
commit f2a42ed
Show file tree

Hide file tree

Showing 1,269 changed files with 26,957 additions and 26,090 deletions.
diff --git a/.fides/db_dataset.yml b/.fides/db_dataset.yml
@@ -777,6 +777,8 @@ dataset:
       data_categories: [system.operations]
     - name: last_test_timestamp
       data_categories: [system.operations]
+    - name: last_run_timestamp
+      data_categories: [system.operations]
     - name: name
       data_categories: [system.operations]
     - name: saas_config
@@ -1064,6 +1066,8 @@ dataset:
       data_categories: [ system.operations ]
     - name: auto_detect_language
       data_categories: [ system.operations ]
+    - name: auto_subdomain_cookie_deletion
+      data_categories: [ system.operations ]
     - name: id
       data_categories: [system.operations]
     - name: name
@@ -1105,6 +1109,8 @@ dataset:
       data_categories: [ system.operations ]
     - name: auto_detect_language
       data_categories: [ system.operations ]
+    - name: auto_subdomain_cookie_deletion
+      data_categories: [ system.operations ]
     - name: id
       data_categories: [system.operations]
     - name: is_default
@@ -1185,6 +1191,8 @@ dataset:
       data_categories: [system.operations]
     - name: has_gpc_flag
       data_categories: [system.operations]
+    - name: parent_id
+      data_categories: [system.operations]
     - name: id
       data_categories: [system.operations]
     - name: internal_description
@@ -1304,6 +1312,10 @@ dataset:
       data_categories: [ system.operations ]
     - name: submitted_by
       data_categories: [ system.operations ]
+    - name: deleted_at
+      data_categories: [ system.operations ]
+    - name: deleted_by
+      data_categories: [ system.operations ]
   - name: privacyrequesterror
     data_categories: []
     fields:
@@ -1995,6 +2007,8 @@ dataset:
       data_categories: [ system.operations ]
     - name: auto_detect_language
       data_categories: [ system.operations ]
+    - name: auto_subdomain_cookie_deletion
+      data_categories: [ system.operations ]
     - name: id
       data_categories: [system.operations]
     - name: name
@@ -2306,4 +2320,20 @@ dataset:
       - name: single_row
         data_categories: [system.operations]
       - name: updated_at
-        data_categories: [system.operations]
+        data_categories: [system.operations]
+  - name: plus_custom_report
+    fields:
+      - name: id
+        data_categories: [system.operations]
+      - name: type
+        data_categories: [system.operations]
+      - name: name
+        data_categories: [system.operations]
+      - name: config
+        data_categories: [system.operations]
+      - name: created_by
+        data_categories: [system.operations]
+      - name: created_at
+        data_categories: [system.operations]
+      - name: updated_at
+        data_categories: [system.operations]
diff --git a/.github/workflows/backend_checks.yml b/.github/workflows/backend_checks.yml
@@ -15,6 +15,9 @@ on:
 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:
   ###############
@@ -143,6 +146,12 @@ jobs:
       - name: Install Nox
         run: pip install nox>=2022
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: Run Performance Tests
         run: nox -s performance_tests
 
@@ -175,6 +184,12 @@ jobs:
       - name: Install Nox
         run: pip install nox>=2022
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: Run test suite
         run: nox -s check_container_startup
 
@@ -213,6 +228,12 @@ jobs:
       - name: Install Nox
         run: pip install nox>=2022
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: Run test suite
         run: nox -s "${{ matrix.test_selection }}"
 
@@ -256,6 +277,12 @@ jobs:
       - name: Install Nox
         run: pip install nox>=2022
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: Run test suite
         run: nox -s "pytest(${{ matrix.test_selection }})"
 
@@ -296,6 +323,12 @@ jobs:
       - name: Install Nox
         run: pip install nox>=2022
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: Run external test suite
         run: nox -s "pytest(ctl-external)"
         env:
@@ -336,6 +369,12 @@ jobs:
       - name: Install Nox
         run: pip install nox>=2022
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: Integration Tests (External)
         env:
           BIGQUERY_DATASET: fidesopstest
@@ -352,6 +391,16 @@ jobs:
           GOOGLE_CLOUD_SQL_POSTGRES_DATABASE_NAME: ${{ secrets.GOOGLE_CLOUD_SQL_POSTGRES_DATABASE_NAME }}
           GOOGLE_CLOUD_SQL_POSTGRES_DATABASE_SCHEMA_NAME: ${{ secrets.GOOGLE_CLOUD_SQL_POSTGRES_DATABASE_SCHEMA_NAME }}
           GOOGLE_CLOUD_SQL_POSTGRES_KEYFILE_CREDS: ${{ secrets.GOOGLE_CLOUD_SQL_POSTGRES_KEYFILE_CREDS }}
+          RDS_MYSQL_AWS_ACCESS_KEY_ID: ${{ secrets.RDS_MYSQL_AWS_ACCESS_KEY_ID }}
+          RDS_MYSQL_AWS_SECRET_ACCESS_KEY: ${{ secrets.RDS_MYSQL_AWS_SECRET_ACCESS_KEY }}
+          RDS_MYSQL_DB_INSTANCE: ${{ secrets.RDS_MYSQL_DB_INSTANCE }}
+          RDS_MYSQL_DB_NAME: ${{ secrets.RDS_MYSQL_DB_NAME }}
+          RDS_MYSQL_DB_USERNAME: ${{ secrets.RDS_MYSQL_DB_USERNAME }}
+          RDS_MYSQL_REGION: ${{ secrets.RDS_MYSQL_REGION }}
+          RDS_POSTGRES_AWS_ACCESS_KEY_ID: ${{ secrets.RDS_POSTGRES_AWS_ACCESS_KEY_ID }}
+          RDS_POSTGRES_AWS_SECRET_ACCESS_KEY: ${{ secrets.RDS_POSTGRES_AWS_SECRET_ACCESS_KEY }}
+          RDS_POSTGRES_DB_USERNAME: ${{ secrets.RDS_POSTGRES_DB_USERNAME }}
+          RDS_POSTGRES_REGION: ${{ secrets.RDS_POSTGRES_REGION }}
           REDSHIFT_TEST_DATABASE: ${{ secrets.REDSHIFT_TEST_DATABASE }}
           REDSHIFT_TEST_DB_SCHEMA: ${{ secrets.REDSHIFT_TEST_DB_SCHEMA }}
           REDSHIFT_TEST_HOST: ${{ secrets.REDSHIFT_TEST_HOST }}
@@ -407,6 +456,12 @@ jobs:
           role: ${{ secrets.VAULT_ROLE }}
           exportToken: True
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: SaaS Connector Tests
         env:
           VAULT_ADDR: ${{ secrets.VAULT_ADDR }}

diff --git a/.github/workflows/cypress_e2e.yml b/.github/workflows/cypress_e2e.yml
@@ -11,6 +11,10 @@ on:
 
 env:
   CI: true
+  env:
+  # Docker auth with read-only permissions.
+  DOCKER_USER: ${{ secrets.DOCKER_USER }}
+  DOCKER_RO_TOKEN: ${{ secrets.DOCKER_RO_TOKEN }}
 
 jobs:
   Cypress-E2E:
@@ -30,6 +34,12 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
       - name: Start test environment in the background
         run: nox -s "fides_env(test)" -- keep_alive
 

diff --git a/.github/workflows/publish_docker.yaml b/.github/workflows/publish_docker.yaml
@@ -8,7 +8,8 @@ on:
       - "*"
 
 env:
-  DOCKER_USER: ethycaci
+  # 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 }}
 
 jobs:
@@ -71,7 +72,7 @@ jobs:
           fetch-depth: 0 # This is required to properly tag images
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ env.DOCKER_USER }}
           password: ${{ env.DOCKER_TOKEN }}

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -27,5 +27,8 @@
   },
   "[python]": {
     "editor.defaultFormatter": "ms-python.black-formatter"
+  },
+  "files.associations": {
+    "*.css": "tailwindcss"
   }
 }