Skip to content

Commit

Permalink
Merge pull request #286 from smart-on-fhir/mikix/tweaks
Browse files Browse the repository at this point in the history
A couple small fixes
  • Loading branch information
mikix authored Oct 30, 2023
2 parents c5c513c + 53d243e commit 43436f1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cumulus_etl/formats/batched_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def _confirm_no_unknown_files_exist(self, folder: str) -> None:
except FileNotFoundError:
return # folder doesn't exist, we're good!

allowed_pattern = re.compile(rf"{self.dbname}\.[0-9]+\.{self.suffix}")
allowed_pattern = re.compile(rf"{self.dbname}\.[0-9]+\.({self.suffix}|meta)")
if not all(map(allowed_pattern.fullmatch, filenames)):
errors.fatal(
f"There are unexpected files in the output folder '{folder}'.\n"
Expand Down
2 changes: 1 addition & 1 deletion docs/deid.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ But the devil is in the details, because it can be configured to do nothing at a
or redact everything.

Cumulus ETL uses a
[custom configuration](https://github.com/smart-on-fhir/cumulus-etl/blob/main/cumulus/deid/ms-config.json),
[custom configuration](https://github.com/smart-on-fhir/cumulus-etl/blob/main/cumulus_etl/deid/ms-config.json),
designed to remove everything by default, and only allow specifically mentioned fields
(i.e. an allow-list or whitelist).

Expand Down
1 change: 1 addition & 0 deletions tests/formats/test_ndjson.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def store(
(None, True),
([], True),
(["condition.1234.ndjson", "condition.22.ndjson"], True),
(["condition.000.meta"], True),
(["condition.ndjson"], False),
(["condition.000.parquet"], False),
(["patient.000.ndjson"], False),
Expand Down

0 comments on commit 43436f1

Please sign in to comment.