SSPROD-54060 - organization: add root org id

sysdig/common.go

@@ -89,6 +89,7 @@ const (
 	SchemaExcludedOrganizationalGroups  = "excluded_organizational_groups"
 	SchemaIncludedCloudAccounts         = "included_cloud_accounts"
 	SchemaExcludedCloudAccounts         = "excluded_cloud_accounts"
+	SchemaOrganizationRootID            = "organization_root_id"
 	SchemaCloudProviderTenantId         = "provider_tenant_id"
 	SchemaCloudProviderAlias            = "provider_alias"
 	SchemaAccountId                     = "account_id"

sysdig/resource_sysdig_secure_organization.go

@@ -73,6 +73,11 @@ func resourceSysdigSecureOrganization() *schema.Resource {
 					Type: schema.TypeString,
 				},
 			},
+			SchemaOrganizationRootID: {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "",
+			},
 		},
 	}
 }
@@ -160,6 +165,7 @@ func resourceSysdigSecureOrganizationUpdate(ctx context.Context, data *schema.Re
 func secureOrganizationFromResourceData(data *schema.ResourceData) *v2.OrganizationSecure {
 	secureOrganization := &v2.OrganizationSecure{CloudOrganization: cloudauth.CloudOrganization{}}
 	secureOrganization.CloudOrganization.ManagementAccountId = data.Get(SchemaManagementAccountId).(string)
+	secureOrganization.CloudOrganization.OrganizationRootId = data.Get(SchemaOrganizationRootID).(string)
 	organizationalUnitIdsData := data.Get(SchemaOrganizationalUnitIds).([]interface{})
 	for _, organizationalUnitIdData := range organizationalUnitIdsData {
 		secureOrganization.CloudOrganization.OrganizationalUnitIds = append(
@@ -233,6 +239,11 @@ func secureOrganizationToResourceData(data *schema.ResourceData, org *v2.Organiz
 		return err
 	}
 
+	err = data.Set(SchemaOrganizationRootID, org.OrganizationRootId)
+	if err != nil {
+		return err
+	}
+
 	err = data.Set(SchemaIDKey, org.Id)
 	if err != nil {
 		return err

sysdig/resource_sysdig_secure_organization_test.go

@@ -121,6 +121,7 @@ resource "sysdig_secure_cloud_auth_account" "sample" {
 }
 resource "sysdig_secure_organization" "sample-org" {
   management_account_id		= sysdig_secure_cloud_auth_account.sample.id
+  organization_root_id 		= "test-id"
 }
 `, accountID, test_service_account_key_encoded, test_service_account_key_encoded)
 }

website/docs/r/secure_organization.md

@@ -33,6 +33,7 @@ resource "sysdig_secure_organization" "sample" {
 * `excluded_organizational_groups` - (Optional) List of organizational groups to exclude during onboarding.
 * `included_cloud_accounts` - (Optional) List of cloud accounts to include during onboarding.
 * `excluded_cloud_accounts` - (Optional) List of cloud accounts to exclude during onboarding.
+* `organization_root_id` - (Optional) Organization's root id if available, else organization/tenant id.
 
 ## Attributes Reference