Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ on:

jobs:
call-terraform-ci-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.1
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.4
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ on:

jobs:
call-terraform-release-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.24.1
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.24.4
secrets: inherit
4 changes: 2 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2026-02-26T09:41:36Z",
"generated_at": "2026-03-26T10:23:21Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -82,7 +82,7 @@
"hashed_secret": "ff9ee043d85595eb255c05dfe32ece02a53efbb2",
"is_secret": false,
"is_verified": false,
"line_number": 59,
"line_number": 73,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
36 changes: 25 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,29 @@ This module supports configuring an IBM Cloud Activity Tracker event routing tar

<!-- BEGIN OVERVIEW HOOK -->
## Overview
* [terraform-ibm-activity-tracker](#terraform-ibm-activity-tracker)
* [Examples](./examples)
:information_source: Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab
* <a href="./examples/advanced">Advanced example</a> <a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-advanced-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/advanced"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom; margin-left: 5px;"></a>
* <a href="./examples/basic">Basic example</a> <a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/basic"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom; margin-left: 5px;"></a>
* [Deployable Architectures](./solutions)
* <a href="./solutions/event-routing-account-settings">Cloud automation for Cloud Monitoring (Event Routing Account Settings)</a>
* <a href="./solutions/fully-configurable">Cloud automation for Activity Tracker Event Routing (Fully configurable)</a>
* [Contributing](#contributing)
<ul>
<li><a href="#terraform-ibm-activity-tracker">terraform-ibm-activity-tracker</a></li>
<li><a href="./examples">Examples</a>
<ul>
<li>
<a href="./examples/advanced">Advanced example</a>
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-advanced-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/advanced"><img src="https://img.shields.io/badge/Deploy%20with%20IBM%20Cloud%20Schematics-0f62fe?style=flat&logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom; margin-left: 5px;"></a>
</li>
<li>
<a href="./examples/basic">Basic example</a>
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/basic"><img src="https://img.shields.io/badge/Deploy%20with%20IBM%20Cloud%20Schematics-0f62fe?style=flat&logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom; margin-left: 5px;"></a>
</li>
</ul>
ℹ️ Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab.
</li>
<li><a href="./solutions">Deployable Architectures</a>
<ul>
<li><a href="./solutions/event-routing-account-settings">Cloud automation for Cloud Monitoring (Event Routing Account Settings)</a></li>
<li><a href="./solutions/fully-configurable">Cloud automation for Activity Tracker Event Routing (Fully configurable)</a></li>
</ul>
</li>
<li><a href="#contributing">Contributing</a></li>
</ul>
<!-- END OVERVIEW HOOK -->

<!--
Expand Down Expand Up @@ -148,14 +162,14 @@ statement instead the previous block.
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.79.0, < 2.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.88.0, < 2.0.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |

### Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.35.10 |
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.35.19 |

### Resources

Expand Down
11 changes: 6 additions & 5 deletions examples/advanced/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Advanced example

<!-- BEGIN SCHEMATICS DEPLOY HOOK -->
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-advanced-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/advanced"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom;"></a>
<p>
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-advanced-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/advanced">
<img src="https://img.shields.io/badge/Deploy%20with%20IBM%20Cloud%20Schematics-0f62fe?style=flat&logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics">
</a><br>
ℹ️ Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab.
</p>
<!-- END SCHEMATICS DEPLOY HOOK -->

<!-- There is a pre-commit hook that will take the title of each example add include it in the repos main README.md -->
Expand All @@ -16,7 +21,3 @@ An end-to-end advanced example that will provision the following:
- An Activity Tracker target for the new COS bucket, Cloud Logs instance and Event Streams instance.
- An Activity Tracker route for the above created targets.
- A CBR (Context-Based Restrictions) zone for the Activity Tracker Event Routing service, with CBR rules protecting all target services (Cloud Logs, Event Streams, and COS bucket) to restrict access to private endpoints only from the Activity Tracker service.

<!-- BEGIN SCHEMATICS DEPLOY TIP HOOK -->
:information_source: Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab
<!-- END SCHEMATICS DEPLOY TIP HOOK -->
14 changes: 7 additions & 7 deletions examples/advanced/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.7"
version = "1.5.0"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand All @@ -16,7 +16,7 @@ module "resource_group" {

module "cloud_logs" {
source = "terraform-ibm-modules/cloud-logs/ibm"
version = "1.10.35"
version = "1.12.8"
resource_group_id = module.resource_group.resource_group_id
region = var.region
data_storage = {
Expand Down Expand Up @@ -56,7 +56,7 @@ locals {

module "event_streams" {
source = "terraform-ibm-modules/event-streams/ibm"
version = "4.6.24"
version = "4.8.0"
es_name = "${var.prefix}-eventsteams-instance"
tags = var.resource_tags
region = var.region
Expand Down Expand Up @@ -102,7 +102,7 @@ locals {

module "key_protect" {
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.5.27"
version = "5.5.36"
resource_group_id = module.resource_group.resource_group_id
region = var.region
resource_tags = var.resource_tags
Expand All @@ -125,7 +125,7 @@ module "key_protect" {

module "cos" {
source = "terraform-ibm-modules/cos/ibm"
version = "10.9.9"
version = "10.14.9"
resource_group_id = module.resource_group.resource_group_id
cos_instance_name = "${var.prefix}-cos"
cos_tags = var.resource_tags
Expand All @@ -138,7 +138,7 @@ locals {

module "buckets" {
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
version = "10.9.9"
version = "10.14.9"
bucket_configs = [
{
bucket_name = local.at_bucket_name
Expand Down Expand Up @@ -183,7 +183,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {
# This zone will be referenced in CBR rules for all target services (COS, Cloud Logs, Event Streams)
module "cbr_zone_atracker" {
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
version = "1.35.10"
version = "1.35.19"
name = "${var.prefix}-atracker-zone"
zone_description = "CBR Network zone for Activity Tracker Event Routing service"
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
required_providers {
ibm = {
source = "ibm-cloud/ibm"
version = ">= 1.79.0"
version = ">= 1.88.0"
}
}
}
12 changes: 6 additions & 6 deletions examples/basic/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# Basic example

<!-- BEGIN SCHEMATICS DEPLOY HOOK -->
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/basic"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom;"></a>
<p>
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=activity-tracker-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/tree/main/examples/basic">
<img src="https://img.shields.io/badge/Deploy%20with%20IBM%20Cloud%20Schematics-0f62fe?style=flat&logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics">
</a><br>
ℹ️ Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab.
</p>
<!-- END SCHEMATICS DEPLOY HOOK -->


<!--
The basic example should call the module(s) stored in this repository with a basic configuration.
Note, there is a pre-commit hook that will take the title of each example and include it in the repos main README.md.
Expand All @@ -16,7 +20,3 @@ An end-to-end basic example that will provision the following:
- A new COS instance and bucket.
- An Activity Tracker target for the new COS bucket.
- An Activity Tracker route for the COS bucket target.

<!-- BEGIN SCHEMATICS DEPLOY TIP HOOK -->
:information_source: Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab
<!-- END SCHEMATICS DEPLOY TIP HOOK -->
4 changes: 2 additions & 2 deletions examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.7"
version = "1.5.0"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand All @@ -16,7 +16,7 @@ module "resource_group" {

module "cos" {
source = "terraform-ibm-modules/cos/ibm"
version = "10.9.9"
version = "10.14.9"
resource_group_id = module.resource_group.resource_group_id
region = var.region
cos_instance_name = "${var.prefix}-cos"
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.79.2" # Locking into 1.79.2 due to https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/pull/43#issuecomment-3027718565
version = "1.88.0"
}
}
}
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ locals {
module "cbr_rule" {
count = length(var.cbr_rules) > 0 ? length(var.cbr_rules) : 0
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
version = "1.35.10"
version = "1.35.19"
rule_description = var.cbr_rules[count.index].description
enforcement_mode = var.cbr_rules[count.index].enforcement_mode
rule_contexts = var.cbr_rules[count.index].rule_contexts
Expand Down
2 changes: 1 addition & 1 deletion solutions/event-routing-account-settings/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
# Lock DA into an exact provider version - renovate automation will keep it updated
ibm = {
source = "ibm-cloud/ibm"
version = "1.87.3"
version = "1.89.0"
}
}
}
10 changes: 5 additions & 5 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,14 @@ resource "ibm_iam_authorization_policy" "atracker_cos" {
module "kms_instance_crn_parser" {
count = var.existing_kms_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.1"
version = "1.4.2"
crn = var.existing_kms_instance_crn
}

module "existing_kms_key_crn_parser" {
count = var.existing_cos_kms_key_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.1"
version = "1.4.2"
crn = var.existing_cos_kms_key_crn
}

Expand All @@ -156,7 +156,7 @@ module "kms" {
}
count = (local.use_kms_module && (length(coalesce(local.buckets_config, [])) != 0)) ? 1 : 0 # no need to create any KMS resources if `kms_encryption_enabled_buckets` is false or `existing_cos_kms_key_crn` is provided or `buckets_config` length is 0
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.5.27"
version = "5.5.36"
create_key_protect_instance = false
region = local.kms_region
existing_kms_instance_crn = var.existing_kms_instance_crn
Expand Down Expand Up @@ -187,7 +187,7 @@ module "kms" {
module "cos_crn_parser" {
count = var.existing_cos_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.1"
version = "1.4.2"
crn = var.existing_cos_instance_crn
}

Expand Down Expand Up @@ -254,7 +254,7 @@ module "cos_bucket" {
}
count = length(coalesce(local.buckets_config, [])) != 0 ? 1 : 0 # no need to call COS module if consumer is using existing COS bucket
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
version = "10.9.9"
version = "10.14.9"
bucket_configs = [
for value in local.buckets_config :
{
Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
# Lock DA into an exact provider version - renovate automation will keep it updated
ibm = {
source = "ibm-cloud/ibm"
version = "1.87.3"
version = "1.89.0"
}
time = {
source = "hashicorp/time"
Expand Down
37 changes: 18 additions & 19 deletions tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
module github.com/terraform-ibm-modules/terraform-ibm-activity-tracker

go 1.25.5
go 1.26.1

require (
github.com/IBM/go-sdk-core/v5 v5.21.2
github.com/gruntwork-io/terratest v0.55.0
github.com/gruntwork-io/terratest v0.56.0
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.68.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.69.7
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
github.com/IBM-Cloud/power-go-client v1.14.4 // indirect
github.com/IBM-Cloud/power-go-client v1.15.0 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
github.com/IBM/platform-services-go-sdk v0.94.0 // indirect
github.com/IBM/platform-services-go-sdk v0.96.0 // indirect
github.com/IBM/project-go-sdk v0.4.0 // indirect
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
Expand All @@ -30,24 +30,24 @@ require (
github.com/gabriel-vasile/mimetype v1.4.11 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-git/go-git/v5 v5.16.4 // indirect
github.com/go-git/go-billy/v5 v5.8.0 // indirect
github.com/go-git/go-git/v5 v5.17.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.6 // indirect
github.com/go-openapi/errors v0.22.7 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/loads v0.22.0 // indirect
github.com/go-openapi/runtime v0.28.0 // indirect
github.com/go-openapi/spec v0.21.0 // indirect
github.com/go-openapi/strfmt v0.25.0 // indirect
github.com/go-openapi/strfmt v0.26.1 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-openapi/validate v0.24.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.28.0 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand All @@ -71,7 +71,7 @@ require (
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/oklog/ulid/v2 v2.1.1 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -82,19 +82,18 @@ require (
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.16.4 // indirect
go.mongodb.org/mongo-driver v1.17.6 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/mod v0.31.0 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/tools v0.40.0 // indirect
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/tools v0.42.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading