From f1f0d5e8f5a6143cec07159ac52b7576240e5c2b Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Thu, 18 Apr 2024 15:28:12 -0400 Subject: [PATCH 1/4] docs: updates communication details in README.md This is a seperate meeting/communication channel from the Compliance WG adding new meeting details and slack channel Signed-off-by: Jennifer Power --- README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c27cb414d..438faa024 100644 --- a/README.md +++ b/README.md @@ -112,23 +112,24 @@ Compliance trestle is currently stable and is based on NIST OSCAL version 1.0.4, Please attend! All are invited. -**When**: Every other Tuesday at 10:00 ET [convert to your local time](https://dateful.com/convert/est-edt-eastern-time) +**When**: -To discover the actual meeting dates: +Every other Tuesday starting on April 23, 2024 · 11:00 – 11:30am est-edt-eastern-time +[convert to your local time](https://dateful.com/convert/) -- Go to [Google Calendar](https://calendar.google.com/calendar/u/0/embed?src=0b8u5el8ta4s93t2cm72tuvhhk@group.calendar.google.com&ctz=America/Los_Angeles) -- Look at entries in `Tue` day of week for *Compliance Trestle Community Call* -- To add to your calendar, `click` on `Compliance Trestle Community Call` and choose `copy to my calendar` +**Where**: [Google Meet Link](https://meet.google.com/mwp-affd-tvu) -**Where**: [https://zoom.us/j/92729235315?pwd=ZFIxU3RSanlVODh4a1g2SFdJOGpoZz09](https://zoom.us/j/92729235315?pwd=ZFIxU3RSanlVODh4a1g2SFdJOGpoZz09) +Dial in: +(US) +1 402-627-0247 PIN: 535 362 764#\ +[More phone numbers](https://tel.meet/mwp-affd-tvu?pin=9717189704231) -- Meeting Id: 927 2923 5315 +> TODO: Fill in docs link -**What**: Meeting agenda and notes [Google Docs](https://docs.google.com/document/d/1z9xvt-Z97j4CtEH1-nR9sMWul7jQkUi_fNY7BdMPgxM/edit#heading=h.nohkp1kbeduj) +**What**: Meeting agenda and notes Google Docs ##### Chat anytime -Slack: [# compliance-grc](https://cloud-native.slack.com/archives/C066TMUBEL8) +Slack: [#oscal-compliance-trestle-agileauthoring-c2p](https://cloud-native.slack.com/archives/C06F3PEPNBW) - **Note**: You can login to Slack using another account like Google, Apple From 79d30e94c7e6eb0d389a5b8780295de5931015ac Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Mon, 22 Apr 2024 11:02:57 -0400 Subject: [PATCH 2/4] docs: add meeting notes link Signed-off-by: Jennifer Power --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 438faa024..376ede45a 100644 --- a/README.md +++ b/README.md @@ -123,9 +123,7 @@ Dial in: (US) +1 402-627-0247 PIN: 535 362 764#\ [More phone numbers](https://tel.meet/mwp-affd-tvu?pin=9717189704231) -> TODO: Fill in docs link - -**What**: Meeting agenda and notes Google Docs +**What**: Meeting agenda and notes [Google Docs](https://docs.google.com/document/d/1XTYM7xnWlIqd-8Nn5-qtgvgk8kH3NSmYle5yZvaS7qs/edit?usp=sharing) ##### Chat anytime From c2845b03bafed8d96c4082b402118caf1eb57985 Mon Sep 17 00:00:00 2001 From: Alejandro Jose Leiva Palomo Date: Mon, 22 Apr 2024 10:12:22 -0600 Subject: [PATCH 3/4] fix: correct conversion link Signed-off-by: Alejandro Jose Leiva Palomo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 376ede45a..d1a01a837 100644 --- a/README.md +++ b/README.md @@ -114,8 +114,8 @@ Please attend! All are invited. **When**: -Every other Tuesday starting on April 23, 2024 · 11:00 – 11:30am est-edt-eastern-time -[convert to your local time](https://dateful.com/convert/) +Every other Tuesday starting on April 23, 2024 · 11:00 – 11:30am ET +[convert to your local time](https://mytime.io/11am/ET) **Where**: [Google Meet Link](https://meet.google.com/mwp-affd-tvu) From 28cc3599b10c50b8fd76f301609497db836e40b8 Mon Sep 17 00:00:00 2001 From: Alejandro Jose Leiva Palomo Date: Mon, 22 Apr 2024 11:27:12 -0600 Subject: [PATCH 4/4] fix: correct lint error Signed-off-by: Alejandro Jose Leiva Palomo --- trestle/core/catalog/catalog_interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trestle/core/catalog/catalog_interface.py b/trestle/core/catalog/catalog_interface.py index 2a901f1ce..be93dd3f5 100644 --- a/trestle/core/catalog/catalog_interface.py +++ b/trestle/core/catalog/catalog_interface.py @@ -393,7 +393,7 @@ def get_count_of_controls_in_catalog(self, recurse: bool) -> int: def get_group_ids(self) -> List[str]: """Get all the group id's as a list of sorted strings.""" - return sorted(filter(lambda id: id, list({control.group_id for control in self._control_dict.values()}))) + return sorted(filter(lambda id_: id_, list({control.group_id for control in self._control_dict.values()}))) def get_all_groups_from_catalog(self) -> List[cat.Group]: """