Skip to content

Commit 5537833

Browse files
terraform-ibm-modules-opsterraform-ibm-modules-ops
authored
feat: The DA has been refactored so that it will work the latest dependant modules and the latest terraform version (#24)
BREAKING CHANGE: Upgrading from a previous version to this version will destroy and recreate infrastructure
1 parent 666c769 commit 5537833

File tree

10 files changed

+112
-95
lines changed

10 files changed

+112
-95
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Update status and "latest release" badges:
66
1. For the status options, see https://terraform-ibm-modules.github.io/documentation/#/badge-status
77
2. Update the "latest release" badge to point to the correct module's repo. Replace "terraform-ibm-module-template" in two places.
88
-->
9-
[![Incubating (Not yet consumable)](https://img.shields.io/badge/status-Incubating%20(Not%20yet%20consumable)-red)](https://terraform-ibm-modules.github.io/documentation/#/badge-status)
9+
[![Stable (With quality checks)](https://img.shields.io/badge/Status-Stable%20(With%20quality%20checks)-green)](https://terraform-ibm-modules.github.io/documentation/#/badge-status)
1010
[![latest release](https://img.shields.io/github/v/release/terraform-ibm-modules/terraform-ibm-web-app-mzr-da?logo=GitHub&sort=semver)](https://github.com/terraform-ibm-modules/terraform-ibm-web-app-mzr-da/releases/latest)
1111
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
1212
[![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/)

‎common-dev-assets‎

‎solutions/e2e/README.md‎

Lines changed: 29 additions & 29 deletions
Large diffs are not rendered by default.

‎solutions/e2e/app-tier.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ data "ibm_is_image" "app_is_image" {
2626
}
2727

2828
module "app_tier_autoscale" {
29-
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.0"
29+
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.2"
3030
prefix = "${var.prefix}-app-tier"
31-
resource_group_id = local.vpc_data.resource_group_id
31+
resource_group_id = local.vpc_data.vpc_data.resource_group
3232
zone = "${var.region}-1"
3333
image_id = data.ibm_is_image.app_is_image.id
3434
subnets = local.app_tier_subnets
35-
vpc_id = local.vpc_data.id
35+
vpc_id = local.vpc_data.vpc_id
3636
placement_group_id = null
3737
machine_type = var.app_machine_type
3838
ssh_key_ids = [module.landing_zone.ssh_key_data[0].id]

‎solutions/e2e/data-tier.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ resource "random_password" "password" {
3535

3636
module "data_tier_vsi" {
3737
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
38-
version = "4.0.0"
39-
resource_group_id = local.vpc_data.resource_group_id
38+
version = "4.2.0"
39+
resource_group_id = local.vpc_data.vpc_data.resource_group
4040
prefix = "${var.prefix}-data-vsi"
41-
vpc_id = local.vpc_data.id
41+
vpc_id = local.vpc_data.vpc_id
4242
subnets = local.data_tier_subnets
4343
image_id = data.ibm_is_image.data_is_image.id
4444
ssh_key_ids = [module.landing_zone.ssh_key_data[0].id]

‎solutions/e2e/main.tf‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
##############################################################################
88

99
module "landing_zone" {
10-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi?ref=v5.20.2"
10+
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module?ref=v6.1.2"
1111
prefix = var.prefix
1212
region = var.region
13-
ibmcloud_api_key = var.ibmcloud_api_key
1413
ssh_public_key = var.ssh_key
1514
override_json_string = templatefile("${path.module}/override.tftpl", { prefix = var.prefix })
1615
}
@@ -40,7 +39,7 @@ module "sm_resource_group" {
4039
count = var.sm_instance_rg_existing || (!var.sm_instance_rg_existing && var.sm_instance_rg_name != null) ? 1 : 0
4140

4241
source = "terraform-ibm-modules/resource-group/ibm"
43-
version = "1.1.5"
42+
version = "1.1.6"
4443

4544
resource_group_name = !var.sm_instance_rg_existing ? var.sm_instance_rg_name : null
4645
existing_resource_group_name = var.sm_instance_rg_existing ? var.sm_instance_rg_name : null
@@ -66,7 +65,7 @@ module "private_secret_engine" {
6665
depends_on = [ibm_resource_instance.secrets_manager]
6766
count = (var.use_sm && var.existing_sm_instance_guid == null) ? 1 : 0
6867
source = "terraform-ibm-modules/secrets-manager-private-cert-engine/ibm"
69-
version = "1.2.2"
68+
version = "1.3.3"
7069
secrets_manager_guid = local.sm_guid
7170
region = local.sm_region
7271
root_ca_name = var.root_ca_name
@@ -83,7 +82,7 @@ module "private_secret_engine" {
8382
# Create a secret group to place the certificate in
8483
module "secrets_manager_group" {
8584
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
86-
version = "1.1.4"
85+
version = "1.2.2"
8786
count = var.use_sm ? 1 : 0
8887
region = local.sm_region
8988
secrets_manager_guid = local.sm_guid
@@ -98,7 +97,7 @@ module "secrets_manager_group" {
9897
module "secrets_manager_private_certificate" {
9998
depends_on = [module.private_secret_engine]
10099
source = "terraform-ibm-modules/secrets-manager-private-cert/ibm"
101-
version = "1.1.3"
100+
version = "1.3.1"
102101
count = var.use_sm ? 1 : 0
103102
cert_name = "${var.prefix}-cts-vpn-private-cert"
104103
cert_description = "Example private cert"

‎solutions/e2e/version.tf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
terraform {
22
required_version = ">= 1.3.0"
3+
# Lock DA into an exact provider version - renovate automation will keep it updated
34
required_providers {
45
ibm = {
56
source = "IBM-Cloud/ibm"
6-
version = ">= 1.60.0"
7+
version = "1.70.1"
78
}
89
random = {
910
source = "hashicorp/random"
10-
version = "3.6.0"
11+
version = "3.6.3"
1112
}
1213
null = {
1314
source = "hashicorp/null"
14-
version = "3.2.2"
15+
version = "3.2.3"
1516
}
1617
}
1718
}

‎solutions/e2e/web-tier.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ locals {
33

44
## VPC data for workload
55
vpc_data = flatten([
6-
for vpc in module.landing_zone.vpc_resource_list : [
6+
for vpc in module.landing_zone.vpc_data : [
77
vpc
8-
] if strcontains(vpc.name, local.workload_vpc)
8+
] if strcontains(vpc.vpc_name, local.workload_vpc)
99
])[0]
1010

1111
web_tier_subnets = flatten([
@@ -36,13 +36,13 @@ data "ibm_is_image" "web_is_image" {
3636

3737
module "web_tier_autoscale" {
3838
depends_on = [ibm_iam_authorization_policy.s2s_lb_to_sm]
39-
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.0"
39+
source = "github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale?ref=v1.0.2"
4040
prefix = "${var.prefix}-web-tier"
41-
resource_group_id = local.vpc_data.resource_group_id
41+
resource_group_id = local.vpc_data.vpc_data.resource_group
4242
zone = "${var.region}-1"
4343
image_id = data.ibm_is_image.web_is_image.id
4444
subnets = local.web_tier_subnets
45-
vpc_id = local.vpc_data.id
45+
vpc_id = local.vpc_data.vpc_id
4646
placement_group_id = null
4747
machine_type = var.web_machine_type
4848
ssh_key_ids = [module.landing_zone.ssh_key_data[0].id]

‎tests/go.mod‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
module github.com/terraform-ibm-modules/terraform-ibm-web-app-mzr-da
22

3-
go 1.21
3+
go 1.22.0
44

5-
toolchain go1.22.4
5+
toolchain go1.23.2
66

77
require (
8+
github.com/gruntwork-io/terratest v0.47.2
89
github.com/stretchr/testify v1.9.0
9-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.35.2
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.41.1
1011
)
1112

1213
require (
@@ -16,12 +17,13 @@ require (
1617
cloud.google.com/go/iam v1.1.1 // indirect
1718
cloud.google.com/go/storage v1.30.1 // indirect
1819
dario.cat/mergo v1.0.0 // indirect
19-
github.com/IBM-Cloud/bluemix-go v0.0.0-20240423071914-9e96525baef4 // indirect
20-
github.com/IBM-Cloud/power-go-client v1.6.0 // indirect
20+
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
21+
github.com/IBM-Cloud/power-go-client v1.8.3 // indirect
2122
github.com/IBM/cloud-databases-go-sdk v0.7.0 // indirect
22-
github.com/IBM/go-sdk-core/v5 v5.17.3 // indirect
23-
github.com/IBM/platform-services-go-sdk v0.63.1 // indirect
24-
github.com/IBM/project-go-sdk v0.3.0 // indirect
23+
github.com/IBM/go-sdk-core/v5 v5.18.0 // indirect
24+
github.com/IBM/platform-services-go-sdk v0.69.3 // indirect
25+
github.com/IBM/project-go-sdk v0.3.6 // indirect
26+
github.com/IBM/schematics-go-sdk v0.3.0 // indirect
2527
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
2628
github.com/Microsoft/go-winio v0.6.1 // indirect
2729
github.com/ProtonMail/go-crypto v1.0.0 // indirect
@@ -62,12 +64,11 @@ require (
6264
github.com/google/uuid v1.6.0 // indirect
6365
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
6466
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
65-
github.com/gruntwork-io/terratest v0.46.15 // indirect
6667
github.com/hashicorp/errwrap v1.1.0 // indirect
6768
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
68-
github.com/hashicorp/go-getter v1.7.4 // indirect
69+
github.com/hashicorp/go-getter v1.7.6 // indirect
6970
github.com/hashicorp/go-multierror v1.1.1 // indirect
70-
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
71+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
7172
github.com/hashicorp/go-safetemp v1.0.0 // indirect
7273
github.com/hashicorp/go-version v1.6.0 // indirect
7374
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
@@ -100,13 +101,13 @@ require (
100101
go.opentelemetry.io/otel v1.16.0 // indirect
101102
go.opentelemetry.io/otel/metric v1.16.0 // indirect
102103
go.opentelemetry.io/otel/trace v1.16.0 // indirect
103-
golang.org/x/crypto v0.24.0 // indirect
104+
golang.org/x/crypto v0.28.0 // indirect
104105
golang.org/x/mod v0.17.0 // indirect
105106
golang.org/x/net v0.25.0 // indirect
106107
golang.org/x/oauth2 v0.10.0 // indirect
107-
golang.org/x/sync v0.7.0 // indirect
108-
golang.org/x/sys v0.21.0 // indirect
109-
golang.org/x/text v0.16.0 // indirect
108+
golang.org/x/sync v0.8.0 // indirect
109+
golang.org/x/sys v0.26.0 // indirect
110+
golang.org/x/text v0.19.0 // indirect
110111
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
111112
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
112113
google.golang.org/api v0.127.0 // indirect

0 commit comments

Comments
 (0)