From e185e3651c8858549fbce7203baeccb53e634a98 Mon Sep 17 00:00:00 2001 From: Terraform IBM Modules Operations Date: Sun, 15 Jun 2025 20:16:34 +0000 Subject: [PATCH 1/3] chore(deps): update ci dependencies --- tests/go.mod | 4 ++-- tests/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/go.mod b/tests/go.mod index 8058077d..d3279ce9 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -2,10 +2,10 @@ module github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure go 1.23.0 -toolchain go1.24.3 +toolchain go1.24.4 require ( - github.com/gruntwork-io/terratest v0.49.0 + github.com/gruntwork-io/terratest v0.50.0 github.com/stretchr/testify v1.10.0 github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.51.1 ) diff --git a/tests/go.sum b/tests/go.sum index f10f4d5f..01bb8743 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -147,8 +147,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI= -github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A= +github.com/gruntwork-io/terratest v0.50.0 h1:AbBJ7IRCpLZ9H4HBrjeoWESITv8nLjN6/f1riMNcAsw= +github.com/gruntwork-io/terratest v0.50.0/go.mod h1:see0lbKvAqz6rvzvN2wyfuFQQG4PWcAb2yHulF6B2q4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= From 884e50ecc3f8379682d497c1c95c52d5e6c3c297 Mon Sep 17 00:00:00 2001 From: surajsbharadwaj Date: Mon, 16 Jun 2025 08:59:57 +0200 Subject: [PATCH 2/3] fix: scc wp trusted profile name --- modules/powervs-vpc-landing-zone/main.tf | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/powervs-vpc-landing-zone/main.tf b/modules/powervs-vpc-landing-zone/main.tf index 4f6a13ec..18f7a022 100644 --- a/modules/powervs-vpc-landing-zone/main.tf +++ b/modules/powervs-vpc-landing-zone/main.tf @@ -78,15 +78,16 @@ module "scc_wp_instance" { providers = { ibm = ibm.ibm-is } count = var.enable_scc_wp ? 1 : 0 - name = "${var.prefix}-scc-wp-instance" - region = lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null) - resource_group_id = module.landing_zone.resource_group_data["${var.prefix}-slz-service-rg"] - scc_wp_service_plan = "graduated-tier" - resource_tags = var.tags - resource_key_name = "${var.prefix}-scc-wp-manager-key" - resource_key_tags = var.tags - cloud_monitoring_instance_crn = local.monitoring_instance.crn != "" ? local.monitoring_instance.crn : null - app_config_crn = var.enable_scc_wp ? module.app_config[0].app_config_crn : null + name = "${var.prefix}-scc-wp-instance" + region = lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null) + resource_group_id = module.landing_zone.resource_group_data["${var.prefix}-slz-service-rg"] + scc_wp_service_plan = "graduated-tier" + scc_workload_protection_trusted_profile_name = "${var.prefix}-workload-protection-trusted-profile" + resource_tags = var.tags + resource_key_name = "${var.prefix}-scc-wp-manager-key" + resource_key_tags = var.tags + cloud_monitoring_instance_crn = local.monitoring_instance.crn != "" ? local.monitoring_instance.crn : null + app_config_crn = var.enable_scc_wp ? module.app_config[0].app_config_crn : null } locals { From 5640e7a6f6c8d29b48d8573f87e0d5546f89387d Mon Sep 17 00:00:00 2001 From: surajsbharadwaj Date: Mon, 16 Jun 2025 12:38:40 +0200 Subject: [PATCH 3/3] fix: release version --- ibm_catalog.json | 6 +++--- .../deploy-arch-ibm-pvs-inf-standard-extend.md | 6 +++--- .../deploy-arch-ibm-pvs-inf-standard-plus-vsi.md | 6 +++--- .../standard/deploy-arch-ibm-pvs-inf-standard.md | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 1011592b..c4e917ee 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -560,7 +560,7 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Standard Landscape' variation", - "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", + "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", "type": "image/svg+xml" }, "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 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Quickstart' variation", - "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", + "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", "type": "image/svg+xml" }, "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 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Extend Standard Landscape' variation", - "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", + "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", "type": "image/svg+xml" }, "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'." diff --git a/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md b/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md index ae06ad5f..64d9331f 100644 --- a/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md +++ b/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-06-15" +lastupdated: "2025-06-16" keywords: subcollection: deployable-reference-architectures authors: @@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.5.1 +version: v8.5.2 compliance: SAPCertified --- @@ -28,7 +28,7 @@ compliance: SAPCertified {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v8.5.1"} +{: toc-version="v8.5.2"} 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'. diff --git a/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md b/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md index ec626964..2f47c852 100644 --- a/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md +++ b/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-06-15" +lastupdated: "2025-06-16" keywords: subcollection: deployable-reference-architectures authors: @@ -16,7 +16,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.5.1 +version: v8.5.2 compliance: --- @@ -28,7 +28,7 @@ compliance: {: toc-content-type="reference-architecture"} {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} -{: toc-version="v8.5.1"} +{: toc-version="v8.5.2"} 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. diff --git a/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md b/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md index 903e1c32..c6ecf4e3 100644 --- a/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md +++ b/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-06-15" +lastupdated: "2025-06-16" keywords: subcollection: deployable-reference-architectures authors: @@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.5.1 +version: v8.5.2 compliance: SAPCertified --- @@ -28,7 +28,7 @@ compliance: SAPCertified {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v8.5.1"} +{: toc-version="v8.5.2"} The Standard deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them.