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

feat: support inheritance for list constraints on v2 module #104

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ To control module's behavior, change variables' values regarding the following:

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

Expand Down
2 changes: 1 addition & 1 deletion examples/basic_org_policies/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ This example shows how to set a basic list of [organization policies](https://cl

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion examples/boolean_org_exclude/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ module "folder-disable-serial-port-access-enforce-with-excludes" {

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion examples/boolean_project_allow/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ It disables enforcement of the `compute.disableSerialPortAccess` constraint on t

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion examples/list_folder_deny/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ This example shows how a list constraint can be applied to disallow certain serv

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion examples/list_org_exclude/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Specifically, it sets a trusted image policy so only images from a trusted image

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion modules/bucket_policy_only/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ This Terraform module allows to set a `Uniform Bucket-level Access` [Organizatio

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion modules/domain_restricted_sharing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ This Terraform module allows to set a `Domain Restricted Sharing` [Organization

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
1 change: 1 addition & 0 deletions modules/org_policy_v2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ To control module's behavior, change variables' values regarding the following:
| constraint | The constraint to be applied | `string` | n/a | yes |
| exclude\_folders | Set of folders to exclude from the policy | `set(string)` | `[]` | no |
| exclude\_projects | Set of projects to exclude from the policy | `set(string)` | `[]` | no |
| inherit\_from\_parent | Determines the inheritance behavior for this policy (only supported on list constraints) | `bool` | `"false"` | no |
| policy\_root | Resource hierarchy node to apply the policy to: can be one of `organization`, `folder`, or `project`. | `string` | `"organization"` | no |
| policy\_root\_id | The policy root id, either of organization\_id, folder\_id or project\_id | `string` | `null` | no |
| policy\_type | The constraint type to work with (either 'boolean' or 'list') | `string` | `"list"` | no |
Expand Down
3 changes: 3 additions & 0 deletions modules/org_policy_v2/list_constraints.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ resource "google_org_policy_policy" "organization_policy" {
parent = "${local.policy_root}/${var.policy_root_id}"

spec {
inherit_from_parent = var.inherit_from_parent
dynamic "rules" {
for_each = local.rules
content {
Expand Down Expand Up @@ -60,6 +61,7 @@ resource "google_org_policy_policy" "folder_policy" {
parent = "${local.policy_root}/${var.policy_root_id}"

spec {
inherit_from_parent = var.inherit_from_parent
dynamic "rules" {
for_each = local.rules
content {
Expand Down Expand Up @@ -96,6 +98,7 @@ resource "google_org_policy_policy" "project_policy" {
parent = "${local.policy_root}/${var.policy_root_id}"

spec {
inherit_from_parent = var.inherit_from_parent
dynamic "rules" {
for_each = local.rules
content {
Expand Down
6 changes: 6 additions & 0 deletions modules/org_policy_v2/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ variable "policy_type" {
default = "list"
}

variable "inherit_from_parent" {
description = "Determines the inheritance behavior for this policy (only supported on list constraints)"
type = bool
default = "false"
}

variable "rules" {
description = "List of rules per policy. Up to 10."
type = list(object(
Expand Down
2 changes: 1 addition & 1 deletion modules/restrict_vm_external_ips/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ This Terraform module allows to set an `Allowed External IPs for VM instances` [

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion modules/skip_default_network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ This Terraform module allows to set a `Skip Default Network Creation` [Organizat

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->