diff --git a/common-dev-assets b/common-dev-assets
index 1cf0dafd..52cd5dd7 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 1cf0dafd08adb8c4450f6110fbb6163efb02f43b
+Subproject commit 52cd5dd7ae623497f188028585ff700799f59795
diff --git a/solutions/e2e/README.md b/solutions/e2e/README.md
index 3942642e..fb337a19 100644
--- a/solutions/e2e/README.md
+++ b/solutions/e2e/README.md
@@ -44,7 +44,8 @@ The end-to-end solution automates the following tasks:
| Name | Version |
|------|---------|
| [terraform](#requirement\_terraform) | >= 1.9.0 |
-| [ibm](#requirement\_ibm) | 1.78.3 |
+| [ibm](#requirement\_ibm) | 1.79.0 |
+| [restapi](#requirement\_restapi) | 1.20.0 |
| [time](#requirement\_time) | 0.13.1 |
### Modules
@@ -52,14 +53,15 @@ The end-to-end solution automates the following tasks:
| Name | Source | Version |
|------|--------|---------|
| [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
-| [standard](#module\_standard) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.4.4 |
+| [standard](#module\_standard) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.5.0 |
### Resources
| Name | Type |
|------|------|
| [time_sleep.wait_15_mins](https://registry.terraform.io/providers/hashicorp/time/0.13.1/docs/resources/sleep) | resource |
-| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/pi_catalog_images) | data source |
+| [ibm_iam_auth_token.auth_token](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/iam_auth_token) | data source |
+| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_catalog_images) | data source |
### Inputs
diff --git a/solutions/e2e/main.tf b/solutions/e2e/main.tf
index 21a646e6..5d6a44de 100644
--- a/solutions/e2e/main.tf
+++ b/solutions/e2e/main.tf
@@ -7,7 +7,7 @@
module "standard" {
source = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone"
- version = "8.4.4"
+ version = "8.5.0"
providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi, ibm.ibm-sm = ibm.ibm-sm }
diff --git a/solutions/e2e/provider.tf b/solutions/e2e/provider.tf
index ad53baf9..4cfe25c0 100644
--- a/solutions/e2e/provider.tf
+++ b/solutions/e2e/provider.tf
@@ -69,3 +69,15 @@ provider "ibm" {
zone = var.powervs_zone
ibmcloud_api_key = var.ibmcloud_api_key != null ? var.ibmcloud_api_key : null
}
+
+data "ibm_iam_auth_token" "auth_token" {
+ provider = ibm.ibm-is
+}
+
+provider "restapi" {
+ uri = "https://resource-controller.cloud.ibm.com"
+ headers = {
+ Authorization = data.ibm_iam_auth_token.auth_token.iam_access_token
+ }
+ write_returns_object = true
+}
diff --git a/solutions/e2e/version.tf b/solutions/e2e/version.tf
index 1c6801f6..e8aa67a3 100644
--- a/solutions/e2e/version.tf
+++ b/solutions/e2e/version.tf
@@ -3,11 +3,16 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
- version = "1.78.3"
+ version = "1.79.0"
}
time = {
source = "hashicorp/time"
version = "0.13.1"
}
+
+ restapi = {
+ source = "Mastercard/restapi"
+ version = "1.20.0"
+ }
}
}
diff --git a/solutions/ibm-catalog/sap-ready-to-go/README.md b/solutions/ibm-catalog/sap-ready-to-go/README.md
index 19d3a8e5..39dce3f7 100644
--- a/solutions/ibm-catalog/sap-ready-to-go/README.md
+++ b/solutions/ibm-catalog/sap-ready-to-go/README.md
@@ -44,7 +44,7 @@
| Name | Version |
|------|---------|
| [terraform](#requirement\_terraform) | >= 1.9.0 |
-| [ibm](#requirement\_ibm) | 1.78.3 |
+| [ibm](#requirement\_ibm) | 1.79.0 |
### Modules
@@ -56,10 +56,10 @@
| Name | Type |
|------|------|
-| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/pi_catalog_images) | data source |
-| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/pi_image) | data source |
-| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/schematics_output) | data source |
-| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/schematics_workspace) | data source |
+| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_catalog_images) | data source |
+| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_image) | data source |
+| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_output) | data source |
+| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_workspace) | data source |
### Inputs
diff --git a/solutions/ibm-catalog/sap-ready-to-go/version.tf b/solutions/ibm-catalog/sap-ready-to-go/version.tf
index 09e89b37..a0124d28 100644
--- a/solutions/ibm-catalog/sap-ready-to-go/version.tf
+++ b/solutions/ibm-catalog/sap-ready-to-go/version.tf
@@ -7,7 +7,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
- version = "1.78.3"
+ version = "1.79.0"
}
}
}
diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md b/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md
index ffb5a26b..11aec518 100644
--- a/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md
+++ b/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md
@@ -128,7 +128,7 @@ S4HANA_2023
| Name | Version |
|------|---------|
| [terraform](#requirement\_terraform) | >= 1.9.0 |
-| [ibm](#requirement\_ibm) | 1.78.3 |
+| [ibm](#requirement\_ibm) | 1.79.0 |
### Modules
@@ -146,10 +146,10 @@ S4HANA_2023
| Name | Type |
|------|------|
-| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/pi_catalog_images) | data source |
-| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/pi_image) | data source |
-| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/schematics_output) | data source |
-| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.3/docs/data-sources/schematics_workspace) | data source |
+| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_catalog_images) | data source |
+| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_image) | data source |
+| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_output) | data source |
+| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_workspace) | data source |
### Inputs
diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf b/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf
index 09e89b37..a0124d28 100644
--- a/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf
+++ b/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf
@@ -7,7 +7,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
- version = "1.78.3"
+ version = "1.79.0"
}
}
}
diff --git a/solutions/sap-ready-to-go/README.md b/solutions/sap-ready-to-go/README.md
index 6e665142..d9967de1 100644
--- a/solutions/sap-ready-to-go/README.md
+++ b/solutions/sap-ready-to-go/README.md
@@ -36,7 +36,7 @@ The 'sap-ready-to-go' solution automates the following tasks:
| Name | Version |
|------|---------|
| [terraform](#requirement\_terraform) | >= 1.9.0 |
-| [ibm](#requirement\_ibm) | 1.78.3 |
+| [ibm](#requirement\_ibm) | 1.79.0 |
### Modules
diff --git a/solutions/sap-ready-to-go/version.tf b/solutions/sap-ready-to-go/version.tf
index 09e89b37..a0124d28 100644
--- a/solutions/sap-ready-to-go/version.tf
+++ b/solutions/sap-ready-to-go/version.tf
@@ -7,7 +7,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
- version = "1.78.3"
+ version = "1.79.0"
}
}
}
diff --git a/tests/pr_test.go b/tests/pr_test.go
index 6112245e..facc73f9 100644
--- a/tests/pr_test.go
+++ b/tests/pr_test.go
@@ -75,7 +75,7 @@ func TestRunBranchExample(t *testing.T) {
func TestRunMainExample(t *testing.T) {
t.Parallel()
- options := setupOptions(t, "m", "wdc06")
+ options := setupOptions(t, "m", "wdc07")
output, err := options.RunTestUpgrade()
if !options.UpgradeTestSkipped {