Skip to content

Commit

Permalink
add(oci): support home region (#7)
Browse files Browse the repository at this point in the history 
* add(oci): support home region

* add(oci): support home region

* add(oci): support home region
  • Loading branch information
@jose-pablo-camacho
jose-pablo-camacho authored Jan 10, 2025
1 parent a986372 commit a6d143b
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 19 deletions.
20 changes: 10 additions & 10 deletions modules/config-posture/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ The following resources will be created in each instrumented compartment/tenancy

## Requirements

| Name | Version |
|---------------------------------------------------------------------------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
| Name | Version |
|---------------------------------------------------------------------------|-----------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
| <a name="requirement_oci"></a> [oci](#requirement\_oci) | >= 6.19.0 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | ~> 1.42 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | ~> 1.42 |

## Providers

Expand All @@ -42,12 +42,12 @@ resource |

## Inputs

| Name | Description | Type | Default | Required |
|------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------|----------|------------------|:--------:|
| <a name="input_is_organizational"></a> [is\_organizational](#input\_is\_organizational) | (Optional) True/False whether secure-for-cloud should be deployed in an organizational setup | `bool` | `false` | no |
| <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | (Required) Customer tenant OCID | `string` | n/a | yes |
| <a name="input_compartment_ocid"></a> [compartment\_ocid](#input\_compartment\_ocid) | (Optional) Customer compartment OCID | `string` | `""` | no |
| <a name="input_sysdig_secure_account_id"></a> [sysdig\_secure\_account\_id](#input\_sysdig\_secure\_account\_id) | (Required) ID of the Sysdig Cloud Account to enable Config Posture for (in case of organization, ID of the Sysdig management account) | `string` | n/a | yes |
| Name | Description | Type | Default | Required |
|------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------|----------|---------|:--------:|
| <a name="input_is_organizational"></a> [is\_organizational](#input\_is\_organizational) | (Optional) True/False whether secure-for-cloud should be deployed in an organizational setup | `bool` | `false` | no |
| <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | (Required) Customer tenant OCID | `string` | n/a | yes |
| <a name="input_compartment_ocid"></a> [compartment\_ocid](#input\_compartment\_ocid) | (Optional) Customer compartment OCID | `string` | `""` | no |
| <a name="input_sysdig_secure_account_id"></a> [sysdig\_secure\_account\_id](#input\_sysdig\_secure\_account\_id) | (Required) ID of the Sysdig Cloud Account to enable Config Posture for (in case of organization, ID of the Sysdig management account) | `string` | n/a | yes |

## Outputs

Expand Down
1 change: 1 addition & 0 deletions modules/config-posture/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ resource "sysdig_secure_cloud_auth_account_component" "oracle_service_principal"
oci = {
api_key = {
user_id = data.sysdig_secure_trusted_oracle_app.config_posture.user_ocid
region = var.region
}
policy = {
policy_id = oci_identity_policy.admit_cspm_policy.id
Expand Down
5 changes: 5 additions & 0 deletions modules/config-posture/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ variable "compartment_ocid" {
variable "sysdig_secure_account_id" {
type = string
description = "(Required) ID of the Sysdig Cloud Account to enable Config Posture for (in case of organization, ID of the Sysdig management account)"
}

variable "region" {
type = string
description = "(Required) Customer home region"
}
18 changes: 9 additions & 9 deletions modules/onboarding/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Note:

## Requirements

| Name | Version |
|---------------------------------------------------------------------------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
| Name | Version |
|---------------------------------------------------------------------------|-----------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
| <a name="requirement_oci"></a> [oci](#requirement\_oci) | >= 6.19.0 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | ~> 1.42 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | ~> 1.42 |

## Providers

Expand All @@ -51,11 +51,11 @@ resource |

## Inputs

| Name | Description | Type | Default | Required |
|-----------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------|----------|------------------|:--------:|
| <a name="input_is_organizational"></a> [is\_organizational](#input\_is\_organizational) | (Optional) True/False whether secure-for-cloud should be deployed in an organizational setup | `bool` | `false` | no |
| <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | (Required) Customer tenant OCID | `string` | n/a | yes |
| <a name="input_compartment_ocid"></a> [compartment\_ocid](#input\_compartment\_ocid) | (Optional) Customer compartment OCID | `string` | `""` | no |
| Name | Description | Type | Default | Required |
|-----------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------|----------|---------|:--------:|
| <a name="input_is_organizational"></a> [is\_organizational](#input\_is\_organizational) | (Optional) True/False whether secure-for-cloud should be deployed in an organizational setup | `bool` | `false` | no |
| <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | (Required) Customer tenant OCID | `string` | n/a | yes |
| <a name="input_compartment_ocid"></a> [compartment\_ocid](#input\_compartment\_ocid) | (Optional) Customer compartment OCID | `string` | `""` | no |

## Outputs

Expand Down
14 changes: 14 additions & 0 deletions modules/onboarding/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
locals {
home_region = [
for subscription in data.oci_identity_region_subscriptions.test_region_subscriptions.region_subscriptions :
subscription.region_name
if subscription.is_home_region == true
]
}

#-----------------------------------------------------------------------------------------
# Fetch the data sources
#-----------------------------------------------------------------------------------------
Expand All @@ -18,6 +26,11 @@ data "oci_identity_tenancy" "tenancy" {
tenancy_id = var.tenancy_ocid
}

// tenancy region data
data "oci_identity_region_subscriptions" "test_region_subscriptions" {
tenancy_id = var.tenancy_ocid
}


// random suffix for policy name
resource "random_id" "suffix" {
Expand Down Expand Up @@ -61,6 +74,7 @@ resource "sysdig_secure_cloud_auth_account" "oracle_account" {
oci = {
api_key = {
user_id = data.sysdig_secure_trusted_oracle_app.onboarding.user_ocid
region = local.home_region[0]
}
policy = {
policy_id = oci_identity_policy.admit_onboarding_policy.id
Expand Down
5 changes: 5 additions & 0 deletions modules/onboarding/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ output "is_organizational" {
value = var.is_organizational
description = "Boolean value to indicate if secure-for-cloud is deployed to an entire Oracle organization or not"
}

output "region" {
value = local.home_region[0]
description = "Customer home region"
}
1 change: 1 addition & 0 deletions tests/examples/modular_organization/onboarding_cspm_compartment.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ module "config-posture" {
tenancy_ocid = module.onboarding.tenancy_ocid
compartment_ocid = module.onboarding.compartment_ocid
is_organizational = module.onboarding.is_organizational
region = module.onboarding.region
}

resource "sysdig_secure_cloud_auth_account_feature" "config_posture" {
Expand Down
1 change: 1 addition & 0 deletions tests/examples/modular_organization/onboarding_cspm_tenancy.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module "config-posture" {
tenancy_ocid = module.onboarding.tenancy_ocid
compartment_ocid = module.onboarding.compartment_ocid
is_organizational = module.onboarding.is_organizational
region = module.onboarding.region
}

resource "sysdig_secure_cloud_auth_account_feature" "config_posture" {
Expand Down

0 comments on commit a6d143b

Please sign in to comment.