Skip to content

Commit 43fcf99

Browse files
terraform-ibm-modules-opsterraform-ibm-modules-ops
authored
fix(deps): update terraform-module<br>- updated the cloud_monitoring_service_endpoints input for the instances DA variation to only allow input value public-and-private. Previouslly it allowed values public and private howevwer these had no impact, as the service was already created with both a public and private endpoint. (#127)
1 parent 5d7108f commit 43fcf99

File tree

8 files changed

+32
-29
lines changed

8 files changed

+32
-29
lines changed

‎cra-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ CRA_TARGETS:
66
PROFILE_ID: "bfacb71d-4b84-41ac-9825-e8a3a3eb7405" # SCC profile ID (currently set to IBM Cloud Framework for Financial Services 1.6.0 profile).
77
CRA_ENVIRONMENT_VARIABLES:
88
TF_VAR_resource_group_name: "test"
9-
TF_VAR_existing_kms_instance_crn: "XXXX:hs-crypto:XXXXXXX:XXXXX:XXXXX"
9+
TF_VAR_existing_kms_instance_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"

‎ibm_catalog.json‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,6 @@
246246
{
247247
"key": "cloud_monitoring_service_endpoints",
248248
"options": [
249-
{
250-
"displayname": "public",
251-
"value": "public"
252-
},
253-
{
254-
"displayname": "private",
255-
"value": "private"
256-
},
257249
{
258250
"displayname": "public-and-private",
259251
"value": "public-and-private"
@@ -460,7 +452,18 @@
460452
],
461453
"id": "95fccffc-ae3b-42df-b6d9-80be5914d852-global",
462454
"name": "deploy-arch-ibm-slz-ocp",
463-
"version": ">=v3.0.0"
455+
"version": ">=v3.0.0",
456+
"optional": true
457+
},
458+
{
459+
"flavors": [
460+
"instances"
461+
],
462+
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
463+
"id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global",
464+
"name": "deploy-arch-ibm-observability",
465+
"version": ">=v1.3.1",
466+
"optional": true
464467
}
465468
],
466469
"architecture": {

‎solutions/agents/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ data "ibm_container_cluster_config" "cluster_config" {
1111

1212
module "observability_agents" {
1313
source = "terraform-ibm-modules/observability-agents/ibm"
14-
version = "1.28.1"
14+
version = "1.29.0"
1515
cluster_id = var.cluster_id
1616
cluster_resource_group_id = var.cluster_resource_group_id
1717
cluster_config_endpoint_type = var.cluster_config_endpoint_type

‎solutions/instances/main.tf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ locals {
103103

104104
module "observability_instance" {
105105
source = "terraform-ibm-modules/observability-instances/ibm"
106-
version = "2.13.2"
106+
version = "2.18.0"
107107
providers = {
108108
logdna.at = logdna.at
109109
logdna.ld = logdna.ld
@@ -132,7 +132,7 @@ module "observability_instance" {
132132

133133
# Activity Tracker
134134
activity_tracker_provision = false
135-
cos_targets = var.enable_at_event_routing_to_cos_bucket ? [
135+
at_cos_targets = var.enable_at_event_routing_to_cos_bucket ? [
136136
{
137137
bucket_name = local.cos_target_bucket_name
138138
endpoint = local.cos_target_bucket_endpoint
@@ -144,7 +144,7 @@ module "observability_instance" {
144144
}
145145
] : []
146146

147-
log_analysis_targets = var.enable_at_event_routing_to_log_analysis ? [
147+
at_log_analysis_targets = var.enable_at_event_routing_to_log_analysis ? [
148148
{
149149
instance_id = module.observability_instance.log_analysis_crn
150150
ingestion_key = module.observability_instance.log_analysis_ingestion_key
@@ -167,10 +167,10 @@ module "kms" {
167167
}
168168
count = (var.existing_cos_kms_key_crn != null || (length(coalesce(local.bucket_config_map, [])) == 0)) ? 0 : 1 # no need to create any KMS resources if passing an existing key, or bucket
169169
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
170-
version = "4.13.4"
170+
version = "4.15.13"
171171
create_key_protect_instance = false
172172
region = local.kms_region
173-
existing_kms_instance_guid = local.existing_kms_guid
173+
existing_kms_instance_crn = var.existing_kms_instance_crn
174174
key_ring_endpoint_type = var.kms_endpoint_type
175175
key_endpoint_type = var.kms_endpoint_type
176176
keys = [
@@ -229,7 +229,7 @@ module "cos_instance" {
229229
}
230230
count = var.existing_cos_instance_crn == null && length(coalesce(local.bucket_config_map, [])) != 0 ? 1 : 0 # no need to call COS module if consumer is using existing COS instance
231231
source = "terraform-ibm-modules/cos/ibm//modules/fscloud"
232-
version = "8.6.2"
232+
version = "8.11.11"
233233
resource_group_id = module.resource_group.resource_group_id
234234
create_cos_instance = true
235235
cos_instance_name = var.prefix != null ? "${var.prefix}-${var.cos_instance_name}" : var.cos_instance_name
@@ -246,7 +246,7 @@ module "cos_bucket" {
246246
}
247247
count = length(coalesce(local.bucket_config_map, [])) != 0 ? 1 : 0 # no need to call COS module if consumer is using existing COS bucket
248248
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
249-
version = "8.6.2"
249+
version = "8.11.11"
250250
bucket_configs = [
251251
for value in local.bucket_config_map :
252252
{

‎solutions/instances/variables.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ variable "cloud_monitoring_tags" {
160160
}
161161

162162
variable "cloud_monitoring_service_endpoints" {
163-
description = "The type of service endpoint to set for the IBM Cloud Monitoring instance."
163+
description = "The type of service endpoint to set for the IBM Cloud Monitoring instance. Allowed values: `public-and-private`"
164164
type = string
165-
default = "private"
165+
default = "public-and-private"
166166
validation {
167-
condition = contains(["public", "private", "public-and-private"], var.cloud_monitoring_service_endpoints)
168-
error_message = "The specified service endpoint is not valid. Specify a valid service endpoint to set for the IBM Cloud Monitoring instance."
167+
condition = contains(["public-and-private"], var.cloud_monitoring_service_endpoints)
168+
error_message = "The specified service endpoint is not valid. Specify a valid service endpoint to set for the IBM Cloud Monitoring instance. Allowed values: `public-and-private`."
169169
}
170170
}
171171

‎tests/pr_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func TestRunUpgradeSolutionInstances(t *testing.T) {
115115
"kms_endpoint_type": "public",
116116
"management_endpoint_type_for_bucket": "public",
117117
"log_analysis_service_endpoints": "public-and-private",
118-
"cloud_monitoring_service_endpoints": "public",
118+
"cloud_monitoring_service_endpoints": "public-and-private",
119119
"enable_platform_logs": "false",
120120
"enable_platform_metrics": "false",
121121
"enable_at_event_routing_to_log_analysis": "true",

‎tests/resources/existing-resources/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module "resource_group" {
1616

1717
module "cos" {
1818
source = "terraform-ibm-modules/cos/ibm"
19-
version = "8.6.2"
19+
version = "8.11.11"
2020
resource_group_id = module.resource_group.resource_group_id
2121
region = var.region
2222
cos_instance_name = "${var.prefix}-cos"
@@ -28,7 +28,7 @@ module "cos" {
2828

2929
module "additional_cos_bucket" {
3030
source = "terraform-ibm-modules/cos/ibm"
31-
version = "8.6.2"
31+
version = "8.11.11"
3232
region = var.region
3333
create_cos_instance = false
3434
existing_cos_instance_id = module.cos.cos_instance_id

‎tests/resources/main.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##############################################################################
44

55
module "landing_zone" {
6-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v5.25.1"
6+
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v5.31.3"
77
region = var.region
88
prefix = var.prefix
99
tags = var.resource_tags
@@ -20,19 +20,19 @@ locals {
2020
}
2121

2222
module "observability_instances" {
23-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-observability-instances?ref=v2.13.2"
23+
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-observability-instances?ref=v2.18.0"
2424
providers = {
2525
logdna.at = logdna.at
2626
logdna.ld = logdna.ld
2727
}
2828
resource_group_id = local.cluster_resource_group_id
2929
region = var.region
3030
log_analysis_plan = "7-day"
31-
log_analysis_service_endpoints = "private"
31+
log_analysis_service_endpoints = "public-and-private"
3232
log_analysis_instance_name = "${var.prefix}-log-analysis"
3333
enable_platform_logs = false
3434
cloud_monitoring_plan = "graduated-tier"
35-
cloud_monitoring_service_endpoints = "private"
35+
cloud_monitoring_service_endpoints = "public-and-private"
3636
cloud_monitoring_instance_name = "${var.prefix}-cloud-monitoring"
3737
enable_platform_metrics = false
3838
activity_tracker_provision = false

0 commit comments

Comments
 (0)