Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify Tenant Metadata #152

Merged
merged 3 commits into from
Jan 25, 2024
Merged

Simplify Tenant Metadata #152

merged 3 commits into from
Jan 25, 2024

Conversation

adhilto
Copy link
Collaborator

@adhilto adhilto commented Jan 18, 2024 •
edited by buidav
Loading

🗣 Description

  • Simplify tenant metadata included in the report to reduce permissions needed
  • Correct tiny bug with groups (I needed to correct it to fully test this PR)

💭 Motivation and context

Closes #145.
Closes #148.

🧪 Testing

Ran python .\scuba.py gws and verified changes were correct.

Also tested using a custom role (just a copy of the super admin role). ScubaGoggles does not work with that role on main, but it does on this branch.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • If applicable, All future TODOs are captured in issues, which are referenced in the PR description.
  • The relevant issues PR resolves are linked preferably via closing keywords.
  • All relevant type-of-change labels have been added.
  • I have read and agree to the CONTRIBUTING.md document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.

✅ Pre-merge Checklist

  • This PR has been smoke tested to ensure main is in a functional state when this PR is merged.
  • Squash all commits into one PR level commit using the Squash and merge button.

✅ Post-merge Checklist

  • Delete the branch to clean up.
  • Close issues resolved by this PR if the closing keywords did not activate.

@adhilto adhilto added bug This issue or pull request addresses broken functionality enhancement labels Jan 18, 2024
@adhilto adhilto self-assigned this Jan 18, 2024
@adhilto adhilto linked an issue Jan 18, 2024 that may be closed by this pull request
Unable to retrieve Organization metadata when running via a User assigned a copied/custom made role #145
Closed
snarve
snarve approved these changes Jan 19, 2024
View reviewed changes
Copy link
Collaborator

@snarve snarve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!
Performed all the tests and verified the updates work with a custom role, also tested on the main branch and confirmed that the test fails there.

@jacdavi jacdavi mentioned this pull request Jan 19, 2024
Closed
@adhilto adhilto requested a review from buidav January 22, 2024 23:28
buidav
buidav approved these changes Jan 25, 2024
View reviewed changes
Copy link
Collaborator

@buidav buidav left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😔 We'll bring back the metadata one day.

@buidav buidav merged commit 8fbf273 into main Jan 25, 2024
2 checks passed
@buidav buidav deleted the 145-simplify-report-metadata branch January 25, 2024 02:47
@buidav buidav added this to the Backlog milestone Jan 25, 2024
adhilto added a commit that referenced this pull request Jan 25, 2024
@adhilto
Simplify Tenant Metadata (#152)
75e8b8a 
* Simplify tenant metadata section and correct groups bug

* Remove scope that is no longer needed

* Remove unneeded OAUTH scope from readme
LaurenBassett pushed a commit that referenced this pull request Feb 7, 2024
@adhilto
Enhance Error handling (#163)
56b1890 
* Implement warning for missing output

* Add missing reo spf check

* Add rego check for 10.2

* Add rego check for 15.2

* Add rego check for 16.2

* Add missing rego checks for group 18

* Broke up the run_reporter function to satisfy linter

* Initial commit of error handling code

* Merge latest changes from main

* Fix bad merge

* Simplify Tenant Metadata (#152)

* Simplify tenant metadata section and correct groups bug

* Remove scope that is no longer needed

* Remove unneeded OAUTH scope from readme

* Merge latest changes from #158, Ensure Each Control Is Included in the
Reports

* Fix bad merge

* Correct gmail bug, forgot to preface the dns function calls with self

* Refactor long lines

* Broke out error handling code into separate functions

* correct error with f string

* Add special case prereqs to rego files

* Modify groups prereqs

* Correct typo in reports API reference

* If prereqs not defined, assume dependence on reports api

* Fix error in provider from merge

* Add missing tests for gws 18

* Fix other regressions caused by merge

* Make the linter happy

* Refactor long lines

* Fix groups API reference links

* Refactor services object to a state variable

* Make customer_id and dnsclient state variables

* Ensure the domains() API is called only once

* Changes to satisfy the linter

* Convert API reference to enums

* Correct URL bugs

* Add documentation

* Rename api_reference to types
@adhilto adhilto mentioned this pull request Dec 4, 2024
Open
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacdavi jacdavi jacdavi left review comments

@snarve snarve snarve approved these changes

@buidav buidav buidav approved these changes

@LaurenBassett LaurenBassett Awaiting requested review from LaurenBassett

Assignees

@adhilto adhilto

Labels
bug This issue or pull request addresses broken functionality enhancement
Projects
None yet
Milestone
Barracuda
4 participants
@adhilto @jacdavi @buidav @snarve