SSPROD-55652 - feat: add support for include/exclude params

jose-pablo-camacho · jose-pablo-camacho · commit 9cb623bbaf03 · 2025-04-22T17:02:06.000-06:00
diff --git a/modules/onboarding/locals.tf b/modules/onboarding/locals.tf
@@ -11,7 +11,7 @@ locals {
   check_old_management_group_ids_param = var.is_organizational && length(var.management_group_ids) > 0
 
   # fetch the GCP root org
-  root_org = var.is_organizational ? [data.google_organization.org[0].org_id] : []
+  root_org = var.is_organizational ? [data.google_organization.org[0].name] : []
 }
 
 check "validate_org_configuration_params" {
diff --git a/modules/onboarding/organizational.tf b/modules/onboarding/organizational.tf
@@ -30,7 +30,7 @@ resource "sysdig_secure_organization" "google_organization" {
   count = var.is_organizational ? 1 : 0
 
   management_account_id          = sysdig_secure_cloud_auth_account.google_account.id
-  organizational_unit_ids        = var.management_group_ids
+  organizational_unit_ids        = local.check_old_management_group_ids_param ? var.management_group_ids : []
   organization_root_id           = local.root_org[0]
   included_organizational_groups = local.check_old_management_group_ids_param ? [] : var.include_folders
   excluded_organizational_groups = local.check_old_management_group_ids_param ? [] : var.exclude_folders

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ locals {`
`11`	`11`	`check_old_management_group_ids_param = var.is_organizational && length(var.management_group_ids) > 0`
`12`	`12`
`13`	`13`	`# fetch the GCP root org`
`14`		`- root_org = var.is_organizational ? [data.google_organization.org[0].org_id] : []`
	`14`	`+ root_org = var.is_organizational ? [data.google_organization.org[0].name] : []`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`check "validate_org_configuration_params" {`