Skip to content

Commit dc27f43

Browse files
mounicatellabatimounicatellabati
authored
Merge branch 'main' into update-scc
2 parents 7aff83e + bc5858b commit dc27f43

File tree

14 files changed

+52
-39
lines changed

14 files changed

+52
-39
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Primary owner should be listed first in list of global owners, followed by any secondary owners
2-
* @akocbek @shemau
2+
* @akocbek @jor2

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,5 @@ on:
88

99
jobs:
1010
call-terraform-ci-pipeline:
11-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.0
1212
secrets: inherit
13-
with:
14-
craSCCv2: true
15-
craConfigYamlFile: "cra-config.yaml"

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ A module for provisioning an [IBM Cloud Security and Compliance Center Workload
1717
* [Submodules](./modules)
1818
* [account_check](./modules/account_check)
1919
* [Examples](./examples)
20-
* [Advanced example](./examples/advanced)
21-
* [Basic example](./examples/basic)
22-
* [Enterprise example with CSPM enabled](./examples/enterprise)
20+
* <div style="display: inline-block;"><a href="./examples/advanced">Advanced example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=swp-advanced-example&repository=github.com/terraform-ibm-modules/terraform-ibm-scc-workload-protection/tree/main/examples/advanced" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
21+
* <div style="display: inline-block;"><a href="./examples/basic">Basic example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=swp-basic-example&repository=github.com/terraform-ibm-modules/terraform-ibm-scc-workload-protection/tree/main/examples/basic" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
22+
* <div style="display: inline-block;"><a href="./examples/enterprise">Enterprise example with CSPM enabled</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=swp-enterprise-example&repository=github.com/terraform-ibm-modules/terraform-ibm-scc-workload-protection/tree/main/examples/enterprise" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
2323
* [Contributing](#contributing)
2424
<!-- END OVERVIEW HOOK -->
2525

@@ -117,7 +117,7 @@ statement instead the previous block.
117117
| Name | Source | Version |
118118
|------|--------|---------|
119119
| <a name="module_account_type_check"></a> [account\_type\_check](#module\_account\_type\_check) | ./modules/account_check | n/a |
120-
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.7 |
120+
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.8 |
121121
| <a name="module_trusted_profile_scc_wp"></a> [trusted\_profile\_scc\_wp](#module\_trusted\_profile\_scc\_wp) | terraform-ibm-modules/trusted-profile/ibm | 3.1.1 |
122122

123123
### Resources

‎common-dev-assets‎

‎cra-config.yaml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cra-tf-validate-ignore-rules.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎examples/advanced/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module "resource_group" {
1616

1717
module "cloud_monitoring" {
1818
source = "terraform-ibm-modules/cloud-monitoring/ibm"
19-
version = "1.10.2"
19+
version = "1.10.8"
2020
resource_group_id = module.resource_group.resource_group_id
2121
region = var.region
2222
instance_name = "${var.prefix}-cm"
@@ -43,7 +43,7 @@ resource "ibm_is_vpc" "example_vpc" {
4343
##############################################################################
4444
module "cbr_zone" {
4545
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
46-
version = "1.33.7"
46+
version = "1.33.8"
4747
name = "${var.prefix}-VPC-network-zone"
4848
zone_description = "CBR Network zone representing VPC"
4949
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -60,7 +60,7 @@ module "cbr_zone" {
6060
# Create new App Config instance
6161
module "app_config" {
6262
source = "terraform-ibm-modules/app-configuration/ibm"
63-
version = "1.13.4"
63+
version = "1.14.0"
6464
region = var.region
6565
resource_group_id = module.resource_group.resource_group_id
6666
app_config_plan = "basic"

‎examples/enterprise/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module "resource_group" {
1515

1616
module "app_config" {
1717
source = "terraform-ibm-modules/app-configuration/ibm"
18-
version = "1.13.4"
18+
version = "1.14.0"
1919
region = var.region
2020
resource_group_id = module.resource_group.resource_group_id
2121
app_config_plan = "basic"

‎ibm_catalog.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
],
6060
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
6161
"id": "045c1169-d15a-4046-ae81-aa3d3348421f-global",
62-
"version": "v1.13.1",
62+
"version": "v1.13.8",
6363
"optional": false,
6464
"input_mapping": [
6565
{
@@ -117,7 +117,7 @@
117117
"fully-configurable"
118118
],
119119
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
120-
"version": "v1.9.0",
120+
"version": "v1.9.10",
121121
"optional": true,
122122
"on_by_default": true,
123123
"input_mapping": [
@@ -147,7 +147,7 @@
147147
"name": "deploy-arch-ibm-cloud-monitoring",
148148
"description": "Configure IBM Cloud Monitoring to collect platform metrics.",
149149
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
150-
"version": "v1.9.0",
150+
"version": "v1.10.6",
151151
"flavors": [
152152
"fully-configurable"
153153
],
@@ -185,7 +185,7 @@
185185
"name": "deploy-arch-ibm-activity-tracker",
186186
"description": "Configure Activity Tracker Event Routing to route the auditing events.",
187187
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
188-
"version": "v1.4.3",
188+
"version": "v1.4.11",
189189
"flavors": [
190190
"fully-configurable"
191191
],

‎main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ resource "ibm_resource_tag" "scc_wp_access_tag" {
6868
module "cbr_rule" {
6969
count = length(var.cbr_rules) > 0 ? length(var.cbr_rules) : 0
7070
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
71-
version = "1.33.7"
71+
version = "1.33.8"
7272
rule_description = var.cbr_rules[count.index].description
7373
enforcement_mode = var.cbr_rules[count.index].enforcement_mode
7474
rule_contexts = var.cbr_rules[count.index].rule_contexts

0 commit comments

Comments
 (0)