Skip to content

Commit d7601ee

Browse files
fix: prefix for scc wp profile names (#1095)
--------- Co-authored-by: surajsbharadwaj <[email protected]>
1 parent d785487 commit d7601ee

File tree

7 files changed

+26
-25
lines changed

7 files changed

+26
-25
lines changed

ibm_catalog.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@
560560
{
561561
"diagram": {
562562
"caption": "Power Virtual Server with VPC landing zone 'Standard Landscape' variation",
563-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.5.1/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
563+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.5.2/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
564564
"type": "image/svg+xml"
565565
},
566566
"description": "The Power Virtual Server with VPC landing zone as variation 'Create a new architecture' deploys VPC services and a Power Virtual Server workspace and interconnects them.\n \nRequired and optional management components are configured."
@@ -1218,7 +1218,7 @@
12181218
{
12191219
"diagram": {
12201220
"caption": "Power Virtual Server with VPC landing zone 'Quickstart' variation",
1221-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.5.1/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
1221+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.5.2/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
12221222
"type": "image/svg+xml"
12231223
},
12241224
"description": "The Power Virtual Server with VPC landing zone as 'Quickstart' variation of 'Create a new architecture' option deploys VPC services and a Power Virtual Server workspace and interconnects them. It also creates one Power virtual server instance of chosen t-shirt size or custom configuration.\n \nRequired and optional management components are configured."
@@ -1545,7 +1545,7 @@
15451545
{
15461546
"diagram": {
15471547
"caption": "Power Virtual Server with VPC landing zone 'Extend Standard Landscape' variation",
1548-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.5.1/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
1548+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.5.2/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
15491549
"type": "image/svg+xml"
15501550
},
15511551
"description": "The Power Virtual Server with VPC landing zone as variation 'Extend Power Virtual Server with VPC landing zone' creates an additional Power Virtual Server workspace and connects it with already created Power Virtual Server with VPC landing zone. It builds on existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'."

modules/powervs-vpc-landing-zone/main.tf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,16 @@ module "scc_wp_instance" {
7878
providers = { ibm = ibm.ibm-is }
7979
count = var.enable_scc_wp ? 1 : 0
8080

81-
name = "${var.prefix}-scc-wp-instance"
82-
region = lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null)
83-
resource_group_id = module.landing_zone.resource_group_data["${var.prefix}-slz-service-rg"]
84-
scc_wp_service_plan = "graduated-tier"
85-
resource_tags = var.tags
86-
resource_key_name = "${var.prefix}-scc-wp-manager-key"
87-
resource_key_tags = var.tags
88-
cloud_monitoring_instance_crn = local.monitoring_instance.crn != "" ? local.monitoring_instance.crn : null
89-
app_config_crn = var.enable_scc_wp ? module.app_config[0].app_config_crn : null
81+
name = "${var.prefix}-scc-wp-instance"
82+
region = lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null)
83+
resource_group_id = module.landing_zone.resource_group_data["${var.prefix}-slz-service-rg"]
84+
scc_wp_service_plan = "graduated-tier"
85+
scc_workload_protection_trusted_profile_name = "${var.prefix}-workload-protection-trusted-profile"
86+
resource_tags = var.tags
87+
resource_key_name = "${var.prefix}-scc-wp-manager-key"
88+
resource_key_tags = var.tags
89+
cloud_monitoring_instance_crn = local.monitoring_instance.crn != "" ? local.monitoring_instance.crn : null
90+
app_config_crn = var.enable_scc_wp ? module.app_config[0].app_config_crn : null
9091
}
9192

9293
locals {

reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024, 2025
4-
lastupdated: "2025-06-15"
4+
lastupdated: "2025-06-16"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1515
use-case: ITServiceManagement
1616
industry: Technology
1717
content-type: reference-architecture
18-
version: v8.5.1
18+
version: v8.5.2
1919
compliance: SAPCertified
2020

2121
---
@@ -28,7 +28,7 @@ compliance: SAPCertified
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance="SAPCertified"}
31-
{: toc-version="v8.5.1"}
31+
{: toc-version="v8.5.2"}
3232

3333
The Power Virtual Server with VPC landing zone as variation 'Extend Power Virtual Server with VPC landing zone' creates an additional Power Virtual Server workspace and connects it with the already created Power Virtual Server with VPC landing zone. It builds on the existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'.
3434

reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024, 2025
4-
lastupdated: "2025-06-15"
4+
lastupdated: "2025-06-16"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -16,7 +16,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1616
use-case: ITServiceManagement
1717
industry: Technology
1818
content-type: reference-architecture
19-
version: v8.5.1
19+
version: v8.5.2
2020
compliance:
2121

2222
---
@@ -28,7 +28,7 @@ compliance:
2828
{: toc-content-type="reference-architecture"}
2929
{: toc-industry="Technology"}
3030
{: toc-use-case="ITServiceManagement"}
31-
{: toc-version="v8.5.1"}
31+
{: toc-version="v8.5.2"}
3232

3333
Quickstart deployment of the Power Virtual Server with VPC landing zone creates VPC services, a Power Virtual Server workspace, and interconnects them. It also deploys a Power Virtual Server of chosen T-shirt size or custom configuration. Supported Os are Aix, IBM i, and Linux images.
3434

reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024, 2025
4-
lastupdated: "2025-06-15"
4+
lastupdated: "2025-06-16"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1515
use-case: ITServiceManagement
1616
industry: Technology
1717
content-type: reference-architecture
18-
version: v8.5.1
18+
version: v8.5.2
1919
compliance: SAPCertified
2020

2121
---
@@ -28,7 +28,7 @@ compliance: SAPCertified
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance="SAPCertified"}
31-
{: toc-version="v8.5.1"}
31+
{: toc-version="v8.5.2"}
3232

3333
The Standard deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them.
3434

tests/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure
22

33
go 1.23.0
44

5-
toolchain go1.24.3
5+
toolchain go1.24.4
66

77
require (
8-
github.com/gruntwork-io/terratest v0.49.0
8+
github.com/gruntwork-io/terratest v0.50.0
99
github.com/stretchr/testify v1.10.0
1010
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.51.1
1111
)

tests/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
147147
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
148148
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
149149
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
150-
github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=
151-
github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=
150+
github.com/gruntwork-io/terratest v0.50.0 h1:AbBJ7IRCpLZ9H4HBrjeoWESITv8nLjN6/f1riMNcAsw=
151+
github.com/gruntwork-io/terratest v0.50.0/go.mod h1:see0lbKvAqz6rvzvN2wyfuFQQG4PWcAb2yHulF6B2q4=
152152
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
153153
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
154154
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

0 commit comments

Comments
 (0)