Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
call-terraform-ci-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].0
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].1
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
call-terraform-release-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].0
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].1
secrets: inherit
28 changes: 14 additions & 14 deletions solutions/e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,35 +105,35 @@ statement instead the previous block.
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.85.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.86.1 |
| <a name="requirement_null"></a> [null](#requirement\_null) | 3.2.4 |
| <a name="requirement_random"></a> [random](#requirement\_random) | 3.7.2 |

### Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_app_tier_autoscale"></a> [app\_tier\_autoscale](#module\_app\_tier\_autoscale) | github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale | v1.0.3 |
| <a name="module_data_tier_vsi"></a> [data\_tier\_vsi](#module\_data\_tier\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.17.0 |
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module | v8.13.1 |
| <a name="module_private_secret_engine"></a> [private\_secret\_engine](#module\_private\_secret\_engine) | terraform-ibm-modules/secrets-manager-private-cert-engine/ibm | 1.11.1 |
| <a name="module_secrets_manager_group"></a> [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.19 |
| <a name="module_secrets_manager_private_certificate"></a> [secrets\_manager\_private\_certificate](#module\_secrets\_manager\_private\_certificate) | terraform-ibm-modules/secrets-manager-private-cert/ibm | 1.9.2 |
| <a name="module_sm_resource_group"></a> [sm\_resource\_group](#module\_sm\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.4.0 |
| <a name="module_web_tier_autoscale"></a> [web\_tier\_autoscale](#module\_web\_tier\_autoscale) | github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale | v1.0.3 |
| <a name="module_app_tier_autoscale"></a> [app\_tier\_autoscale](#module\_app\_tier\_autoscale) | github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale | v1.0.12 |
| <a name="module_data_tier_vsi"></a> [data\_tier\_vsi](#module\_data\_tier\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.20.3 |
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module | v8.14.3 |
| <a name="module_private_secret_engine"></a> [private\_secret\_engine](#module\_private\_secret\_engine) | terraform-ibm-modules/secrets-manager-private-cert-engine/ibm | 1.12.5 |
| <a name="module_secrets_manager_group"></a> [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.32 |
| <a name="module_secrets_manager_private_certificate"></a> [secrets\_manager\_private\_certificate](#module\_secrets\_manager\_private\_certificate) | terraform-ibm-modules/secrets-manager-private-cert/ibm | 1.10.5 |
| <a name="module_sm_resource_group"></a> [sm\_resource\_group](#module\_sm\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.4.7 |
| <a name="module_web_tier_autoscale"></a> [web\_tier\_autoscale](#module\_web\_tier\_autoscale) | github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale | v1.0.12 |

### Resources

| Name | Type |
|------|------|
| [ibm_iam_authorization_policy.s2s_lb_to_sm](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.85.0/docs/resources/iam_authorization_policy) | resource |
| [ibm_resource_instance.secrets_manager](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.85.0/docs/resources/resource_instance) | resource |
| [ibm_iam_authorization_policy.s2s_lb_to_sm](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.86.1/docs/resources/iam_authorization_policy) | resource |
| [ibm_resource_instance.secrets_manager](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.86.1/docs/resources/resource_instance) | resource |
| [null_resource.primary_postgresql_install](https://registry.terraform.io/providers/hashicorp/null/3.2.4/docs/resources/resource) | resource |
| [null_resource.secondary_postgresql_install](https://registry.terraform.io/providers/hashicorp/null/3.2.4/docs/resources/resource) | resource |
| [random_password.password](https://registry.terraform.io/providers/hashicorp/random/3.7.2/docs/resources/password) | resource |
| [ibm_is_image.app_is_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.85.0/docs/data-sources/is_image) | data source |
| [ibm_is_image.data_is_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.85.0/docs/data-sources/is_image) | data source |
| [ibm_is_image.web_is_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.85.0/docs/data-sources/is_image) | data source |
| [ibm_is_image.app_is_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.86.1/docs/data-sources/is_image) | data source |
| [ibm_is_image.data_is_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.86.1/docs/data-sources/is_image) | data source |
| [ibm_is_image.web_is_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.86.1/docs/data-sources/is_image) | data source |

### Inputs

Expand Down
2 changes: 1 addition & 1 deletion solutions/e2e/app-tier.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ data "ibm_is_image" "app_is_image" {
}

module "app_tier_autoscale" {
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.3"
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.12"
prefix = "${var.prefix}-app-tier"
resource_group_id = local.vpc_data.vpc_data.resource_group
zone = "${var.region}-1"
Expand Down
2 changes: 1 addition & 1 deletion solutions/e2e/data-tier.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resource "random_password" "password" {

module "data_tier_vsi" {
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
version = "5.17.0"
version = "5.20.3"
resource_group_id = local.vpc_data.vpc_data.resource_group
prefix = "${var.prefix}-data-vsi"
vpc_id = local.vpc_data.vpc_id
Expand Down
10 changes: 5 additions & 5 deletions solutions/e2e/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
##############################################################################

module "landing_zone" {
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module?ref=v8.13.1"
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module?ref=v8.14.3"
prefix = var.prefix
region = var.region
ssh_public_key = var.ssh_key
Expand Down Expand Up @@ -39,7 +39,7 @@ module "sm_resource_group" {
count = var.sm_instance_rg_existing || (!var.sm_instance_rg_existing && var.sm_instance_rg_name != null) ? 1 : 0

source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.7"

resource_group_name = !var.sm_instance_rg_existing ? var.sm_instance_rg_name : null
existing_resource_group_name = var.sm_instance_rg_existing ? var.sm_instance_rg_name : null
Expand Down Expand Up @@ -68,7 +68,7 @@ module "private_secret_engine" {
depends_on = [ibm_resource_instance.secrets_manager]
count = (var.use_sm && var.existing_sm_instance_guid == null) ? 1 : 0
source = "terraform-ibm-modules/secrets-manager-private-cert-engine/ibm"
version = "1.11.1"
version = "1.12.5"
secrets_manager_guid = local.sm_guid
region = local.sm_region
root_ca_name = var.root_ca_name
Expand All @@ -85,7 +85,7 @@ module "private_secret_engine" {
# Create a secret group to place the certificate in
module "secrets_manager_group" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.19"
version = "1.3.32"
count = var.use_sm ? 1 : 0
region = local.sm_region
secrets_manager_guid = local.sm_guid
Expand All @@ -100,7 +100,7 @@ module "secrets_manager_group" {
module "secrets_manager_private_certificate" {
depends_on = [module.private_secret_engine]
source = "terraform-ibm-modules/secrets-manager-private-cert/ibm"
version = "1.9.2"
version = "1.10.5"
count = var.use_sm ? 1 : 0
cert_name = "${var.prefix}-cts-vpn-private-cert"
cert_description = "Example private cert"
Expand Down
2 changes: 1 addition & 1 deletion solutions/e2e/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.85.0"
version = "1.86.1"
}
random = {
source = "hashicorp/random"
Expand Down
2 changes: 1 addition & 1 deletion solutions/e2e/web-tier.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data "ibm_is_image" "web_is_image" {

module "web_tier_autoscale" {
depends_on = [ibm_iam_authorization_policy.s2s_lb_to_sm]
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.3"
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.12"
prefix = "${var.prefix}-web-tier"
resource_group_id = local.vpc_data.vpc_data.resource_group
zone = "${var.region}-1"
Expand Down
24 changes: 11 additions & 13 deletions tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
module github.com/terraform-ibm-modules/terraform-ibm-web-app-mzr-da

go 1.24.0

toolchain go1.25.4
go 1.25.5

require (
github.com/gruntwork-io/terratest v0.54.0
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.34
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.64.1
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
github.com/IBM-Cloud/power-go-client v1.14.3 // indirect
github.com/IBM-Cloud/power-go-client v1.14.4 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
github.com/IBM/go-sdk-core/v5 v5.21.2 // indirect
github.com/IBM/platform-services-go-sdk v0.90.4 // indirect
github.com/IBM/platform-services-go-sdk v0.91.0 // indirect
github.com/IBM/project-go-sdk v0.4.0 // indirect
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
Expand All @@ -37,7 +35,7 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.4 // indirect
github.com/go-openapi/errors v0.22.6 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/loads v0.22.0 // indirect
Expand Down Expand Up @@ -90,13 +88,13 @@ require (
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/mod v0.29.0 // indirect
golang.org/x/crypto v0.46.0 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/tools v0.38.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/text v0.32.0 // indirect
golang.org/x/tools v0.39.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading