Skip to content

Commit 182c272

Browse files
authored
fix: fix folder and project exclusions (#71)
1 parent a014dd1 commit 182c272

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

modules/org_policy_v2/boolean_constraints.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ resource "google_org_policy_policy" "project_policy_boolean" {
104104
resource "google_org_policy_policy" "policy_boolean_exclude_folders" {
105105
for_each = (local.boolean_policy && !local.project) ? var.exclude_folders : []
106106

107-
name = "${local.policy_root}/${var.policy_root_id}/policies/${var.constraint}"
108-
parent = "${local.policy_root}/${var.policy_root_id}"
107+
name = "folders/${each.value}/policies/${var.constraint}"
108+
parent = "folders/${each.value}"
109109

110110
spec {
111111
rules {
@@ -119,8 +119,8 @@ resource "google_org_policy_policy" "policy_boolean_exclude_folders" {
119119
resource "google_org_policy_policy" "policy_boolean_exclude_projects" {
120120
for_each = (local.boolean_policy && !local.project) ? var.exclude_projects : []
121121

122-
name = "${local.policy_root}/${var.policy_root_id}/policies/${var.constraint}"
123-
parent = "${local.policy_root}/${var.policy_root_id}"
122+
name = "projects/${each.value}/policies/${var.constraint}"
123+
parent = "projects/${each.value}"
124124

125125
spec {
126126
rules {

modules/org_policy_v2/list_constraints.tf

+5-4
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ resource "google_org_policy_policy" "project_policy" {
128128
resource "google_org_policy_policy" "folder_policy_list_exclude_folders" {
129129
for_each = (local.list_policy && !local.project) ? var.exclude_folders : []
130130

131-
name = "${local.policy_root}/${var.policy_root_id}/policies/${var.constraint}"
132-
parent = "${local.policy_root}/${var.policy_root_id}"
131+
name = "folders/${each.value}/policies/${var.constraint}"
132+
parent = "folders/${each.value}"
133+
133134

134135
spec {
135136
reset = true
@@ -142,8 +143,8 @@ resource "google_org_policy_policy" "folder_policy_list_exclude_folders" {
142143
resource "google_org_policy_policy" "project_policy_list_exclude_projects" {
143144
for_each = (local.list_policy && !local.project) ? var.exclude_projects : []
144145

145-
name = "${local.policy_root}/${var.policy_root_id}/policies/${var.constraint}"
146-
parent = "${local.policy_root}/${var.policy_root_id}"
146+
name = "projects/${each.value}/policies/${var.constraint}"
147+
parent = "projects/${each.value}"
147148

148149
spec {
149150
reset = true

0 commit comments

Comments
 (0)