Skip to content

Commit 2248bbc

Browse files
Vipin KumarVipin Kumar
authored andcommitted
added cloud logs dependency
1 parent 6bdbad6 commit 2248bbc

File tree

3 files changed

+52
-5
lines changed

3 files changed

+52
-5
lines changed

ibm_catalog.json

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"key": "enable_at_event_routing_to_cloud_logs"
125125
},
126126
{
127-
"key": "existing_cloud_logs_instance_crn"
127+
"key": "existing_cloud_logs_crn"
128128
},
129129
{
130130
"key": "cos_region"
@@ -234,6 +234,53 @@
234234
]
235235
}
236236
],
237+
"dependencies": [
238+
{
239+
"name": "add-ons-beta-deploy-arch-ibm-base-ocp-vpc",
240+
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
241+
"flavors": [
242+
"fully-configurable"
243+
],
244+
"id": "1728a4fd-f561-4cf9-82ef-2b1eeb5da1a8-global",
245+
"ignore_auto_referencing": [
246+
"*"
247+
],
248+
"optional": false,
249+
"on_by_default": true,
250+
"input_mapping": [
251+
{
252+
"dependency_input": "cloud_logs_instance_name",
253+
"value": "at-cloud-logs"
254+
},
255+
{
256+
"dependency_input": "existing_cloud_logs_crn",
257+
"version_input": "existing_cloud_logs_crn",
258+
"reference_version": true
259+
},
260+
{
261+
"dependency_input": "existing_cos_instance_crn",
262+
"version_input": "existing_cos_instance_crn",
263+
"reference_version": true
264+
},
265+
{
266+
"dependency_input": "prefix",
267+
"version_input": "prefix",
268+
"reference_version": true
269+
},
270+
{
271+
"dependency_input": "existing_resource_group_name",
272+
"version_input": "existing_resource_group_name",
273+
"reference_version": true
274+
},
275+
{
276+
"dependency_output": "cloud_logs_crn",
277+
"version_input": "existing_cloud_logs_crn"
278+
}
279+
],
280+
"version": "^v3.43.1"
281+
}
282+
],
283+
"dependency_version_2": true,
237284
"architecture": {
238285
"descriptions": "This architecture supports the deployment of IBM Cloud Activity Tracker Event Routing to an Object Storage bucket and Cloud Logs target.",
239286
"features": [

solutions/fully-configurable/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ locals {
6666
target_ids = [module.activity_tracker.activity_tracker_targets[local.cos_target_name].id]
6767
}] : []
6868

69-
at_cloud_logs_route = var.enable_at_event_routing_to_cloud_logs && var.existing_cloud_logs_instance_crn != null ? [{
69+
at_cloud_logs_route = var.enable_at_event_routing_to_cloud_logs && var.existing_cloud_logs_crn != null ? [{
7070
route_name = local.at_cloud_logs_route_name
7171
locations = ["*", "global"]
7272
target_ids = [module.activity_tracker.activity_tracker_targets[local.cloud_logs_target_name].id]
@@ -114,9 +114,9 @@ module "activity_tracker" {
114114
}
115115
] : []
116116

117-
cloud_logs_targets = var.enable_at_event_routing_to_cloud_logs && var.existing_cloud_logs_instance_crn != null ? [
117+
cloud_logs_targets = var.enable_at_event_routing_to_cloud_logs && var.existing_cloud_logs_crn != null ? [
118118
{
119-
instance_id = var.existing_cloud_logs_instance_crn
119+
instance_id = var.existing_cloud_logs_crn
120120
target_region = var.region
121121
target_name = local.cloud_logs_target_name
122122
}

solutions/fully-configurable/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ variable "provider_visibility" {
5858
# IBM Cloud Logs
5959
##############################################################################
6060

61-
variable "existing_cloud_logs_instance_crn" {
61+
variable "existing_cloud_logs_crn" {
6262
type = string
6363
nullable = true
6464
default = null

0 commit comments

Comments
 (0)