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.

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

Add intercepting sinks to the organization and folder modules #2799

Conversation

rshokati2
Copy link
Contributor

@rshokati2 rshokati2 commented Jan 5, 2025

Allow fabric organization module to intercept audit logging including all child resources. The validation block ensures both intercept_children and include_children as set to true, and the destination 'type' is a 'project'.


Checklist

I applicable, I acknowledge that I have:

  • Read the contributing guide
  • Ran terraform fmt on all modified files
  • Regenerated the relevant README.md files using tools/tfdoc.py
  • Made sure all relevant tests pass

Copy link

google-cla bot commented Jan 5, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@juliocc juliocc changed the title RS-469: Allow fabric organization module to intercept audit logging Allow organization module to intercept audit logging Jan 6, 2025
@juliocc juliocc changed the title Allow organization module to intercept audit logging Add intercepting sinks to the organization module Jan 6, 2025
Copy link
Collaborator

@juliocc juliocc left a comment

Choose a reason for hiding this comment

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

@rshokati2 Thanks for sending this PR! It's been on my to-do list for a while.

These changes also make sense for the folder module. Could you replicate them there as well?

I've left a few more comments below.

modules/organization/variables-logging.tf Outdated Show resolved Hide resolved
modules/organization/variables-logging.tf Outdated Show resolved Hide resolved
@rshokati2
Copy link
Contributor Author

@rshokati2 Thanks for sending this PR! It's been on my to-do list for a while.

These changes also make sense for the folder module. Could you replicate them there as well?

I've left a few more comments below.

Hey @juliocc, thank you for your prompt review and response, I've made the requested adjustments. thanks!

@rshokati2 rshokati2 requested a review from juliocc January 8, 2025 01:15
Copy link
Collaborator

@juliocc juliocc left a comment

Choose a reason for hiding this comment

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

Thank you @rshokati2!

@juliocc
Copy link
Collaborator

juliocc commented Jan 8, 2025

@rshokati2 can you fix the remaining issues? Or if you want I can fix them but I need permissions to modify your PR

@rshokati2
Copy link
Contributor Author

Hey @juliocc, I did not have access to grant you write permissions on the PR but I believe it's been provided by @EmileHofsink, can you please double check? if you can give me some details, I may be able to assist, as far as I can tell the validation rule seems to be breaking when the type=logging and intercept_child is enabled.

@juliocc juliocc changed the title Add intercepting sinks to the organization module Add intercepting sinks to the organization and folder modules Jan 10, 2025
Copy link
Collaborator

@juliocc juliocc left a comment

Choose a reason for hiding this comment

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

Thanks @rshokati2! I think I've addressed all the issues and it should get merged once all the tests run

@juliocc juliocc enabled auto-merge (squash) January 10, 2025 10:26
@juliocc juliocc merged commit b4abbfe into GoogleCloudPlatform:master Jan 10, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants