Skip to content

SSPROD-55868: Add flag for automatic onboarding in Organization resource #630

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

Merged
Merged
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
1 change: 1 addition & 0 deletions sysdig/common.go
Original file line number Diff line number Diff line change
@@ -90,6 +90,7 @@ const (
SchemaIncludedCloudAccounts = "included_cloud_accounts"
SchemaExcludedCloudAccounts = "excluded_cloud_accounts"
SchemaOrganizationRootID = "organization_root_id"
SchemaAutomaticOnboarding = "automatic_onboarding"
SchemaCloudProviderTenantId = "provider_tenant_id"
SchemaCloudProviderAlias = "provider_alias"
SchemaAccountId = "account_id"
2,399 changes: 1,563 additions & 836 deletions sysdig/internal/client/v2/cloudauth/go/cloud_account.pb.go

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions sysdig/resource_sysdig_secure_organization.go
Original file line number Diff line number Diff line change
@@ -78,6 +78,11 @@ func resourceSysdigSecureOrganization() *schema.Resource {
Optional: true,
Default: "",
},
SchemaAutomaticOnboarding: {
Type: schema.TypeBool,
Optional: true,
Default: false,
},
},
}
}
@@ -166,6 +171,7 @@ func secureOrganizationFromResourceData(data *schema.ResourceData) *v2.Organizat
secureOrganization := &v2.OrganizationSecure{CloudOrganization: cloudauth.CloudOrganization{}}
secureOrganization.CloudOrganization.ManagementAccountId = data.Get(SchemaManagementAccountId).(string)
secureOrganization.CloudOrganization.OrganizationRootId = data.Get(SchemaOrganizationRootID).(string)
secureOrganization.CloudOrganization.AutomaticOnboarding = data.Get(SchemaAutomaticOnboarding).(bool)
organizationalUnitIdsData := data.Get(SchemaOrganizationalUnitIds).([]interface{})
for _, organizationalUnitIdData := range organizationalUnitIdsData {
secureOrganization.CloudOrganization.OrganizationalUnitIds = append(
@@ -244,6 +250,11 @@ func secureOrganizationToResourceData(data *schema.ResourceData, org *v2.Organiz
return err
}

err = data.Set(SchemaAutomaticOnboarding, org.AutomaticOnboarding)
if err != nil {
return err
}

err = data.Set(SchemaIDKey, org.Id)
if err != nil {
return err
1 change: 1 addition & 0 deletions sysdig/resource_sysdig_secure_organization_test.go
Original file line number Diff line number Diff line change
@@ -122,6 +122,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"
automatic_onboarding = false
}
`, accountID, test_service_account_key_encoded, test_service_account_key_encoded)
}
1 change: 1 addition & 0 deletions website/docs/r/secure_organization.md
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ resource "sysdig_secure_organization" "sample" {
* `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.
* `automatic_onboarding` - (Optional) Whether or not accounts in organization are to be detected automatically.

## Attributes Reference