Merge project changes again

.fides/fides.toml

@@ -42,6 +42,7 @@ root_password = "Testpassword1!"
 masking_strict = true
 require_manual_request_approval = false
 task_retry_backoff = 1
+subject_identity_verification_required = false
 task_retry_count = 0
 task_retry_delay = 1
 worker_enabled = false

.github/workflows/publish_docker.yaml

@@ -12,7 +12,7 @@ env:
   DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
 
 jobs:
-  push-fidesctl:
+  push-fides:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/publish_privacy_center_to_dockerhub.yaml

@@ -0,0 +1,36 @@
+name: Docker Build & Push Privacy Center
+
+on:
+  push:
+    tags:
+      - "*"
+
+env:
+  DOCKER_USER: ethycaci
+  DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
+
+jobs:
+  push-fides-privacy-center-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ethyca/fides-privacy-center
+
+      - name: Build and publish
+        uses: docker/build-push-action@v3
+        with:
+          context: ./clients/ops/privacy-center
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}

CHANGELOG.md

@@ -21,12 +21,30 @@ The types of changes are:
 
 * Added more taxonomy fields that can be edited via the UI [#1000](https://github.com/ethyca/fides/pull/1000)
 
+### Fixed
+
+* Fixed failing mypy tests [#1030](https://github.com/ethyca/fides/pull/1030)
+* Fixed an issue where `fides push --diff` would return a false positive diff [#1026](https://github.com/ethyca/fides/pull/1026)
+
+### Docs
+
+* Minor formatting updates to [Policy Webhooks](https://ethyca.github.io/fidesops/guides/policy_webhooks/) documentation [#1114](https://github.com/ethyca/fidesops/pull/1114)
+
+### Removed
+
+* Removed create superuser [#1116](https://github.com/ethyca/fidesops/pull/1116)
+
 ## [1.8.2](https://github.com/ethyca/fides/compare/1.8.1...1.8.2) - 2022-08-18
 
 ### Added
 
-* Added the ability to edit taxonomy fields via the UI [#977](https://github.com/ethyca/fides/pull/977)
+* Added the ability to edit taxonomy fields via the UI [#977](https://github.com/ethyca/fides/pull/977) [#1028](https://github.com/ethyca/fides/pull/1028)
 * New column `is_default` added to DataCategory, DataUse, DataSubject, and DataQualifier tables [#976](https://github.com/ethyca/fides/pull/976)
+* Added the ability to add taxonomy fields via the UI [#1019](https://github.com/ethyca/fides/pull/1019)
+* Added the ability to delete taxonomy fields via the UI [#1006](https://github.com/ethyca/fides/pull/1006)
+  * Only non-default taxonomy entities can be deleted [#1023](https://github.com/ethyca/fides/pull/1023)
+* Prevent deleting taxonomy `is_default` fields and from adding `is_default=True` fields via the API [#990](https://github.com/ethyca/fides/pull/990).
+* Added a "Custom" tag to distinguish user defined taxonomy fields from default taxonomy fields in the UI [#1027](https://github.com/ethyca/fides/pull/1027)
 
 ### Changed
 

clients/ctl/admin-ui/__tests__/features/taxonomy-helpers.test.tsx

@@ -0,0 +1,18 @@
+import { parentKeyFromFidesKey } from "~/features/taxonomy/helpers";
+
+describe("taxonomy helpers", () => {
+  describe("parent key from fides key", () => {
+    it("should handle nested fides keys", () => {
+      const fidesKey = "grandparent.parent.child";
+      expect(parentKeyFromFidesKey(fidesKey)).toEqual("grandparent.parent");
+    });
+    it("should handle empty fides key", () => {
+      const fidesKey = "";
+      expect(parentKeyFromFidesKey(fidesKey)).toEqual("");
+    });
+    it("should handle single fides key", () => {
+      const fidesKey = "root";
+      expect(parentKeyFromFidesKey(fidesKey)).toEqual("");
+    });
+  });
+});

clients/ctl/admin-ui/__tests__/features/taxonomy-transform.test.tsx

@@ -14,16 +14,19 @@ describe("data category transform", () => {
                 description: "Account's city level address data.",
                 label: "Account City",
                 value: "account.contact.city",
+                is_default: true,
               },
             ],
             description: "Contact data related to a system account.",
             label: "Account Contact Data",
             value: "account.contact",
+            is_default: true,
           },
         ],
         description: "Data related to a system account.",
         label: "Account Data",
         value: "account",
+        is_default: true,
       },
       {
         children: [
@@ -32,11 +35,13 @@ describe("data category transform", () => {
             description: "Data used to manage access to the system.",
             label: "Authentication Data",
             value: "system.authentication",
+            is_default: true,
           },
         ],
         description: "Data unique to, and under control of the system.",
         label: "System Data",
         value: "system",
+        is_default: true,
       },
       {
         children: [
@@ -46,6 +51,7 @@ describe("data category transform", () => {
               "Data derived from user provided data or as a result of user actions in the system.",
             label: "Derived Data",
             value: "user.derived",
+            is_default: true,
           },
           {
             children: [
@@ -55,6 +61,7 @@ describe("data category transform", () => {
                   "Data provided or created directly by a user that is not identifiable.",
                 label: "User Provided Non-Identifiable Data",
                 value: "user.provided.nonidentifiable",
+                is_default: true,
               },
               {
                 children: [
@@ -63,31 +70,36 @@ describe("data category transform", () => {
                     description: "Age range data.",
                     label: "User Provided Non-Specific Age",
                     value: "user.provided.identifiable.non_specific_age",
+                    is_default: true,
                   },
                   {
                     children: [],
                     description:
                       "Data related to the individual's political opinions.",
                     label: "Political Opinion",
                     value: "user.provided.identifiable.political_opinion",
+                    is_default: true,
                   },
                 ],
                 description:
                   "Data provided or created directly by a user that is linked to or identifies a user.",
                 label: "User Provided Identifiable Data",
                 value: "user.provided.identifiable",
+                is_default: true,
               },
             ],
             description:
               "Data provided or created directly by a user of the system.",
             label: "User Provided Data",
             value: "user.provided",
+            is_default: true,
           },
         ],
         description:
           "Data related to the user of the system, either provided directly or derived based on their usage.",
         label: "User Data",
         value: "user",
+        is_default: true,
       },
     ]);
   });
@@ -100,20 +112,23 @@ describe("data category transform", () => {
         value: "anonymous_user",
         description:
           "An individual that is unidentifiable to the systems. Note - This should only be applied to truly anonymous users where there is no risk of re-identification",
+        is_default: true,
         children: [],
       },
       {
         label: "Citizen Voter",
         value: "citizen_voter",
         description:
           "An individual registered to voter with a state or authority.",
+        is_default: true,
         children: [],
       },
       {
         label: "Commuter",
         value: "commuter",
         description:
           "An individual that is traveling or transiting in the context of location tracking.",
+        is_default: true,
         children: [],
       },
     ]);

clients/ctl/admin-ui/cypress/e2e/datasets.cy.ts

@@ -98,7 +98,7 @@ describe("Dataset", () => {
       );
       cy.getByTestId("input-data_qualifier").should("contain", "Identified");
       cy.getByTestId("selected-categories").children().should("have.length", 1);
-      cy.getByTestId("taxonomy-entity-user.derived.identifiable.unique_id");
+      cy.getByTestId("taxonomy-entity-user.unique_id");
     });
 
     it("Can render an edit form for a dataset collection with existing values", () => {
@@ -434,21 +434,11 @@ describe("Dataset", () => {
         "have.attr",
         "data-checked"
       );
-      const ancestors = [
-        "User Data",
-        "Derived Data",
-        "Derived User Identifiable Data",
-      ];
-      ancestors.forEach((a) => {
-        cy.get(`[data-testid='checkbox-${a}'] > span`).should(
-          "have.attr",
-          "data-indeterminate"
-        );
-      });
-      cy.getByTestId("selected-categories").should(
-        "contain",
-        "user.derived.identifiable.unique_id"
+      cy.get(`[data-testid='checkbox-User Data'] > span`).should(
+        "have.attr",
+        "data-indeterminate"
       );
+      cy.getByTestId("selected-categories").should("contain", "user.unique_id");
     });
 
     it("Can deselect data categories", () => {
@@ -479,24 +469,18 @@ describe("Dataset", () => {
       cy.getByTestId("field-row-uuid").click();
       cy.getByTestId("data-category-dropdown").click();
       cy.getByTestId("checkbox-Telemetry Data").click();
-      cy.getByTestId("checkbox-Account Data").click();
+      cy.getByTestId("checkbox-System Data").click();
       cy.getByTestId("data-category-done-btn").click();
-      cy.getByTestId("selected-categories").should(
-        "contain",
-        "user.derived.identifiable.unique_id"
-      );
-      cy.getByTestId("selected-categories").should(
-        "contain",
-        "user.derived.identifiable.telemetry"
-      );
-      cy.getByTestId("selected-categories").should("contain", "account");
+      cy.getByTestId("selected-categories").should("contain", "user.unique_id");
+      cy.getByTestId("selected-categories").should("contain", "user.telemetry");
+      cy.getByTestId("selected-categories").should("contain", "system");
       cy.getByTestId("save-btn").click({ force: true });
       cy.wait("@putDataset").then((interception) => {
         const { body } = interception.request;
         expect(body.collections[0].fields[5].data_categories).to.eql([
-          "user.derived.identifiable.unique_id",
-          "user.derived.identifiable.telemetry",
-          "account",
+          "user.unique_id",
+          "user.telemetry",
+          "system",
         ]);
       });
     });
@@ -505,40 +489,41 @@ describe("Dataset", () => {
       cy.visit("/dataset/demo_users");
       cy.getByTestId("field-row-uuid").click();
       cy.getByTestId("data-category-dropdown").click();
-      // expand account data
-      cy.getByTestId("expand-Account Data").click();
+      // expand system data
+      cy.getByTestId("expand-System Data").click();
       // select 1/2 children
-      cy.getByTestId("checkbox-Account Contact Data").click();
-      cy.get("[data-testid='checkbox-Account Contact Data'] > span").should(
+      cy.getByTestId("checkbox-Authentication Data").click();
+      cy.get("[data-testid='checkbox-Authentication Data'] > span").should(
         "have.attr",
         "data-checked"
       );
       // parent should be indeterminate since not all children are checked
-      cy.get("[data-testid='checkbox-Account Data'] > span").should(
+      cy.get("[data-testid='checkbox-System Data'] > span").should(
         "have.attr",
         "data-indeterminate"
       );
       // now select all children
-      cy.getByTestId("checkbox-Payment Data").click();
+      cy.getByTestId("checkbox-Operations Data").click();
       // parent should be checked since all children are checked
-      cy.get("[data-testid='checkbox-Account Data'] > span").should(
+      cy.get("[data-testid='checkbox-System Data'] > span").should(
         "have.attr",
         "data-checked"
       );
-      // the children's children should be disabled and checked since the parent is selected
-      cy.get("[data-testid='checkbox-Account City'] > span").should(
+      // the children of selected parents should be disabled
+      cy.getByTestId("checkbox-Credentials").click();
+      cy.get("[data-testid='checkbox-Password'] > span").should(
         "have.attr",
         "data-checked"
       );
-      cy.get("[data-testid='checkbox-Account City'] > span").should(
+      cy.get("[data-testid='checkbox-Biometric Credentials'] > span").should(
         "have.attr",
         "data-disabled"
       );
       cy.getByTestId("data-category-done-btn").click();
       const expectedSelected = [
-        "account.contact",
-        "account.payment",
-        "user.derived.identifiable.unique_id",
+        "system.authentication",
+        "system.operations",
+        "user.credentials",
       ];
       expectedSelected.forEach((e) => {
         cy.getByTestId("selected-categories").should("contain", e);
@@ -549,27 +534,24 @@ describe("Dataset", () => {
       cy.visit("/dataset/demo_users");
       cy.getByTestId("field-row-uuid").click();
       cy.getByTestId("data-category-dropdown").click();
-      cy.getByTestId("checkbox-Account Data").click();
-      cy.get("[data-testid='checkbox-Account Data'] > span").should(
+      cy.getByTestId("checkbox-System Data").click();
+      cy.get("[data-testid='checkbox-System Data'] > span").should(
         "have.attr",
         "data-checked"
       );
       cy.getByTestId("data-category-done-btn").click();
-      cy.getByTestId("selected-categories").should(
-        "contain",
-        "user.derived.identifiable.unique_id"
-      );
-      cy.getByTestId("selected-categories").should("contain", "account");
+      cy.getByTestId("selected-categories").should("contain", "user.unique_id");
+      cy.getByTestId("selected-categories").should("contain", "system");
       cy.getByTestId("data-category-dropdown").click();
       cy.getByTestId("data-category-clear-btn").click();
-      cy.get("[data-testid='checkbox-Account Data'] > span").should(
+      cy.get("[data-testid='checkbox-System Data'] > span").should(
         "not.have.attr",
         "data-checked"
       );
       cy.getByTestId("data-category-done-btn").click();
       cy.getByTestId("selected-categories").should(
         "not.contain",
-        "user.derived.identifiable.unique_id"
+        "user.unique_id"
       );
     });
   });