Fidesops -> Unified Fides final merge

[ThomasLaPiana]

Closes

Code Changes

• changes from: ensure that db_index is never None on RedisSettings fidesops#1427
• changes from: Specify Multiple Masking Strategies fidesops#1428

Steps to Confirm

• For specifying multiple masking strategies, bring the server up nox -s dev and run a PUT request against the masking engine with one strategy (backwards compatible) and multiple strategies (a list of strategies) under "masking_strategy". Also test that there is a lot more flexibility in configuration format - in this example, I have a string mapped to a list of lists.

Note that specifying multiple masking strategies may feel contrived in core fides, but this work is to support combining multiple plus strategies.

PUT masking/mask

{
  "values": [
    "111-111-1111",
    "customer-1@example.com"
  ],
  "masking_strategy": [
    {
      "strategy": "random_string_rewrite",
      "configuration": {
        "length": 20,
        "format_preservation": {
          "suffix": "@masked.com"
        }
      }
    },
    {
      "strategy": "hash",
      "configuration": {
        "a": [
          [
            "b"
          ]
        ]
      }
    }
  ]
}

Pre-Merge Checklist

• All CI Pipelines Succeeded
• Documentation Updated:
  • documentation complete, or draft/outline provided (tag docs-team to complete/review on this branch)
  • documentation issue created (tag docs-team to complete issue separately)
• Issue Requirements are Met
• Relevant Follow-Up Issues Created
• Update CHANGELOG.md

Description Of Changes

The old git merge strategy across repos isn't working anymore, so it's back to the hard way...

Luckily not much needs to get copy/pasted over, just those two PRs worth of changes. I've confirmed that everything before that was merged in the previously by manually checking the code changes against fides main

[pattisdr]

Unrelated to this work, noting that i was unable to run the fides webserver locally without commenting out the fides-ui and fides-pc items in the docker-compose.yml.

nox -s dev -- postgres

[+] Running 0/2
 ⠿ fides-ui Error                                                                                                                                                                                                                  0.8s
 ⠿ fides-pc Error                                                                                                                                                                                                                  0.8s
Error response from daemon: manifest for ethyca/fides-privacy-center:local not found: manifest unknown: manifest unknown
nox > Session dev raised exception Exception('Error executing command: docker compose -f docker-compose.yml -f docker/docker-compose.integration-postgres.yml up')
Traceback (most recent call last):
  File "/opt/homebrew/lib/python3.10/site-packages/nox/sessions.py", line 728, in execute
    self.func(session)
  File "/opt/homebrew/lib/python3.10/site-packages/nox/_decorators.py", line 75, in __call__
    return self.func(*args, **kwargs)
  File "/Users/Dawn/fides/noxfiles/dev_nox.py", line 46, in dev
    run_infrastructure(
  File "/Users/Dawn/fides/noxfiles/run_infrastructure.py", line 83, in run_infrastructure
    return _run_application(path)
  File "/Users/Dawn/fides/noxfiles/run_infrastructure.py", line 191, in _run_application
    _run_cmd_or_err(f"docker compose {docker_compose_path} up")
  File "/Users/Dawn/fides/noxfiles/run_infrastructure.py", line 146, in _run_cmd_or_err
    raise Exception(f"Error executing command: {cmd}")
Exception: Error executing command: docker compose -f docker-compose.yml -f docker/docker-compose.integration-postgres.yml up
nox > Session dev failed.

[NevilleS]

Thanks Dawn