diff --git a/app-install/version.tf b/app-install/version.tf index 07254bd..26f496b 100644 --- a/app-install/version.tf +++ b/app-install/version.tf @@ -3,7 +3,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.54.0" + version = ">= 1.54.0" } } } diff --git a/custom-slz/main.tf b/custom-slz/main.tf index e3f3a87..299f587 100644 --- a/custom-slz/main.tf +++ b/custom-slz/main.tf @@ -3,7 +3,7 @@ ############################################################################## module "landing_zone" { - source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi?ref=v4.4.4" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi?ref=v4.6.0" prefix = var.prefix region = var.region ibmcloud_api_key = var.ibmcloud_api_key diff --git a/custom-slz/version.tf b/custom-slz/version.tf index 07254bd..beadd05 100644 --- a/custom-slz/version.tf +++ b/custom-slz/version.tf @@ -3,7 +3,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.54.0" + version = "1.56.1" } } } diff --git a/docs/part2/20-custom-module.md b/docs/part2/20-custom-module.md index fae202a..421ce6e 100644 --- a/docs/part2/20-custom-module.md +++ b/docs/part2/20-custom-module.md @@ -19,11 +19,11 @@ You can find the code for this step in the [custom-slz](https://github.com/IBM/i Notice these two settings in the `main.tf` file: - The `override_json_string` input variable takes the full JSON definition. In this example, the JSON that is passed to the module through the `templatefile` function first to 'inject' the prefix. That process is done to ensure uniqueness of the resource group names in the account, as mentioned in the first item. - - The `source` is set to the standard VSI pattern and points to the version 4.5.4 (the most recent version at the time that this lab was written). + - The `source` is set to the standard VSI pattern and points to the version 4.6.0 (the most recent version at the time that this lab was written). ```hcl module "landing_zone" { - source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi?ref=v4.5.4" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi?ref=v4.6.0" prefix = var.prefix region = var.region ibmcloud_api_key = var.ibmcloud_api_key diff --git a/docs/part2/40-catalog-onboarding.md b/docs/part2/40-catalog-onboarding.md index f2f5035..fcb6f6b 100644 --- a/docs/part2/40-catalog-onboarding.md +++ b/docs/part2/40-catalog-onboarding.md @@ -35,7 +35,7 @@ The result is a **secure webapp** tile in the IBM Cloud catalog that guides user You can select a category that matches your deployable architecture. User who browses the catalog can filter by category. 1. Click **Add product**. -1. (Optional) Change the default name for your deployable: +1. (Optional) Change the default name for your product: 1. Click **Edit**. @@ -69,7 +69,7 @@ In the next few steps, you edit the information that applies to the version. required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.54.0" + version = "1.56.1" } } } @@ -128,6 +128,8 @@ In the **Add deployable architecture details** section, you can add architecture ![](../images/part-2/ee8a02736dedaaec38f6826ef5e454765563da63.png) + 1. Add a required caption and description and click **Update**. + 1. In the **Step 2 - add prerequisites** pane, leave the input as blank, and click **Next**. In this step, you can identify prerequisite deployable architectures that must be deployed. However, in this lab, our module deploys the full infrastructure, and you don't need to identify other deployable architectures that are required. @@ -165,10 +167,10 @@ Before the deployable architecture is published to others to see, it is validate ``` 1. In **Step 2 - Input variable**, specify the following parameters: - - `ibmcloud_api_key`: Input the API key that was provided to you - - `region`: Set to eu-gb + - `ibmcloud_api_key`: Untoggle *Use a secret* and input the API key that you generated. + - `region`: Set to `eu-gb`. - `ssh_key`: Copy and paste the SSH key that was generated in previous step (content of `lab2-catalog-key.pub`). - - `ssh_private_key`: Copy and paste the private key that was generated in previous step (content of `lab2-catalog-key`) in the [heredoc format](https://en.wikipedia.org/wiki/Here_document). You should end up with a string looking like: + - `ssh_private_key`: Untoggle *Use a secret* and copy and paste the private key that was generated in previous step (content of `lab2-catalog-key`) in the [heredoc format](https://en.wikipedia.org/wiki/Here_document). You should end up with a string looking like: ```text <