Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f1d3151
chain of deploy created
RiadhJouini Mar 30, 2025
c36d6bd
correct templateID variable
RiadhJouini Apr 2, 2025
215896e
output templateID generated correclty
RiadhJouini Apr 4, 2025
e4868fe
corrected the enterprise_id issue
RiadhJouini Apr 4, 2025
5004d5c
trusted profile general correction
RiadhJouini Apr 4, 2025
c05350d
adjustments done on account groups
RiadhJouini Apr 5, 2025
1959b55
added a README.md file
RiadhJouini Apr 7, 2025
260f233
added the provider back to basic folder
RiadhJouini Apr 7, 2025
c97839a
added graduated tier in the wp module calling
RiadhJouini Apr 7, 2025
e8567ea
replaced the sources with module ones
RiadhJouini Apr 7, 2025
4b21975
cleaning and adjusting
RiadhJouini Apr 8, 2025
0b2bd41
Refactor: use variables to dynamically create IAM policy templates wi…
RiadhJouini Apr 8, 2025
6907e5e
adjusted sources from local to modules
RiadhJouini Apr 8, 2025
2df6577
adjusting as per IBM standards
RiadhJouini Apr 10, 2025
87d99cc
adjustments
RiadhJouini Apr 12, 2025
7c83e01
App Config Config Aggregator sub-module moved to Resource
RiadhJouini Apr 15, 2025
279fed6
Move trusted relationship sub-module to main Trusted Profile module a…
RiadhJouini Apr 15, 2025
319c066
adjustments
RiadhJouini Apr 16, 2025
e093d1d
other adjustments
RiadhJouini Apr 16, 2025
cfdd65e
corrected README
RiadhJouini Apr 16, 2025
a648fa8
adjusting the modules syntax
RiadhJouini Apr 16, 2025
03b8f64
added versions
RiadhJouini Apr 17, 2025
053108d
Merge branch 'main' into main
ocofaigh Apr 17, 2025
9b752bc
cleanup
ocofaigh Apr 17, 2025
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
60 changes: 0 additions & 60 deletions examples/complete/main.tf

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this change. You are removing it

This file was deleted.

55 changes: 0 additions & 55 deletions examples/complete/variables.tf

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this change. You are removing it

This file was deleted.

File renamed without changes.
56 changes: 56 additions & 0 deletions examples/enterprise/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.1.6"

resource_group_name = var.resource_group == null ? "${var.prefix}-rg" : null
existing_resource_group_name = var.resource_group
}


module "scc_wp" {
source = "../.."
name = var.prefix
region = var.region
resource_group_id = module.resource_group.resource_group_id
resource_tags = var.resource_tags
access_tags = var.access_tags
scc_wp_service_plan = "graduated-tier"
}

module "app_config" {
source = "../../../terraform-ibm-app-configuration"
region = var.region
resource_group_id = module.resource_group.resource_group_id
app_config_name = "${var.prefix}-app-config"
app_config_tags = var.resource_tags

app_config_collections = [
{
name = "${var.prefix}-collection"
collection_id = "${var.prefix}-collection"
description = "Collection for ${var.prefix}"
}
]
}

module "trusted_profiles" {
source = "../../../terraform-ibm-trusted-profile/examples/enterprise"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we'll fix this references once we have clarity from IBM experts

region = var.region
app_config_crn = module.app_config.app_config_crn
scc_wp_crn = module.scc_wp.crn
ibmcloud_api_key = var.ibmcloud_api_key

onboard_account_groups = true
}
module "config_aggregator" {
source = "../../../terraform-ibm-app-configuration/modules/config_aggregator"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we'll fix this references once we have clarity from IBM experts


app_config_instance_guid = module.app_config.app_config_guid
region = var.region
enterprise_id = var.enterprise_id
trusted_profile_template_id = module.trusted_profiles.trusted_profile_template_id
enterprise_trusted_profile_id = module.trusted_profiles.trusted_profile_app_config_enterprise.profile_id
general_trusted_profile_id = module.trusted_profiles.trusted_profile_app_config_general.profile_id

}

Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
output "scc_wp_crn" {
description = "CRN of the SCC Workload Protection instance"
value = module.scc_wp.wp_instance_crn
value = module.scc_wp.crn
}
output "scc_wp_config_aggregator_id" {
value = module.scc_wp_config_aggregator.scc_wp_config_aggregator_id

output "config_aggregator_id" {
value = module.config_aggregator.scc_wp_config_aggregator_id
}

output "trusted_profile_template_id" {
value = module.trusted_profiles.trusted_profile_template_id
}
Expand Down
5 changes: 5 additions & 0 deletions examples/enterprise/provider.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
provider "ibm" {
region = var.region
ibmcloud_api_key = var.ibmcloud_api_key
}

40 changes: 40 additions & 0 deletions examples/enterprise/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
variable "enterprise_id" {
type = string
description = "The Enterprise ID used to scope the Config Aggregator or IAM templates."
}

variable "region" {
type = string
description = "IBM Cloud region where resources will be deployed."
}

variable "prefix" {
type = string
description = "Prefix used for naming all provisioned resources."
}

variable "resource_group" {
type = string
default = null
description = "Name of an existing resource group to use. If null, a new one will be created using the prefix."
}

variable "resource_tags" {
type = list(string)
default = []
description = "List of tags to apply to resources for tracking and organization."
}

variable "access_tags" {
type = list(string)
default = []
description = "List of access tags to apply to resources for IAM policy scoping."
}


variable "ibmcloud_api_key" {
type = string
description = "IBM Cloud API key used for authentication."
sensitive = true
}

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
ibm = {
source = "ibm-cloud/ibm"
version = ">= 1.65.0, < 2.0.0"
version = ">= 1.70.0, < 2.0.0"
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions outputs.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
########################################################################################################################
# Outputs
########################################################################################################################
output "wp_instance_crn" {
value = ibm_resource_instance.scc_wp.crn
}

output "name" {
description = "Name of created SCC WP instance."
Expand Down