Skip to content
This repository was archived by the owner on Jun 30, 2023. It is now read-only.

Commit ca727e4

Browse files
umarali-nagoorhkantare
umarali-nagoor
authored and
hkantare
committed
Supporting arbitrary parameters block & Timeouts
1 parent 0a98bb9 commit ca727e4

File tree

21 files changed

+329
-71
lines changed

21 files changed

+329
-71
lines changed

‎examples/activity-tracker-logdna-instance/README.md‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,20 @@ data "ibm_resource_group" "res_group" {
1212
}
1313
1414
module "activity-tracker_instance" {
15-
source = "terraform-ibm-modules/observability/ibm//modules/activity-tracker-logdna"
15+
source = "terraform-ibm-modules/observability/ibm//modules/activity-tracker-logdna"
16+
17+
service_name = var.service_name
18+
plan = var.plan
19+
region = var.region
20+
resource_group_id = data.ibm_resource_group.res_group.id
21+
parameters = var.parameters
22+
tags = var.tags
23+
create = var.create_timeout
24+
update = var.update_timeout
25+
delete = var.delete_timeout
1626
17-
service_name = var.service_name
18-
plan = var.plan
19-
region = var.region
20-
resource_group_id = data.ibm_resource_group.res_group.id
21-
tags = var.tags
2227
}
28+
2329
```
2430

2531
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
@@ -33,5 +39,11 @@ module "activity-tracker_instance" {
3339
| region | Location of the resource | string | n/a | yes |
3440
| tags | Tags that should be applied to the service | list(string) | n/a | no |
3541
| resource\_group | Name of the resource group | string | n/a | yes |
42+
| parameters | Arbitrary parameters to pass | map(string) | n/a | no |
43+
| create_timeout | Timeout duration for create | string | n/a | no |
44+
| update_timeout | Timeout duration for update | string | n/a | no |
45+
| delete_timeout | Timeout duration for delete | string | n/a | no |
46+
47+
NOTE: We can set the create, update and delete timeouts as string. For e.g say we want to set 15 minutes timeout then the value should be "15m".
3648

3749

‎examples/activity-tracker-logdna-instance/input.tfvars‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ tags = ["T1","T2"]
1212

1313
tags = ["T1", "T2"]
1414

15+
parameters = {
16+
"service_supertenant" = "schematics"
17+
"associated_logging_crn" = "1126fa03-7df6-4096-802a-8b1df3b06398"
18+
"provision_key" = "fcdb7641"
19+
}
20+

‎examples/activity-tracker-logdna-instance/main.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,10 @@ module "activity-tracker_instance" {
1717
plan = var.plan
1818
region = var.region
1919
resource_group_id = data.ibm_resource_group.res_group.id
20+
parameters = var.parameters
2021
tags = var.tags
22+
create_timeout = var.create_timeout
23+
update_timeout = var.update_timeout
24+
delete_timeout = var.delete_timeout
25+
2126
}

‎examples/activity-tracker-logdna-instance/variables.tf‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,35 @@ variable "resource_group" {
2323
description = "Enter the name of the Resource group ."
2424
}
2525

26+
variable "create_timeout" {
27+
type = string
28+
description = "Timeout duration for create."
29+
default = null
30+
}
31+
32+
variable "update_timeout" {
33+
type = string
34+
description = "Timeout duration for update."
35+
default = null
36+
}
37+
38+
variable "delete_timeout" {
39+
type = string
40+
description = "Timeout duration for delete."
41+
default = null
42+
}
43+
44+
variable "parameters" {
45+
type = map(string)
46+
description = "Arbitrary parameters to pass"
47+
default = null
48+
}
49+
50+
2651
variable "tags" {
2752
type = list(string)
2853
description = "Tags that should be applied to the service"
2954
default = null
3055
}
3156

57+

‎examples/logging-logdna-instance/README.md‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,22 @@ data "ibm_resource_group" "logdna" {
1212
}
1313
1414
module "logdna_instance" {
15-
source = "terraform-ibm-modules/observability/ibm//modules/logging-logdna"
16-
17-
18-
bind_resource_key = var.bind_resource_key
19-
service_name = var.service_name
20-
resource_group_id = data.ibm_resource_group.logdna.id
21-
plan = var.plan
22-
region = var.region
23-
service_endpoints = var.service_endpoints
24-
tags = var.tags
25-
resource_key_name = var.resource_key_name
26-
role = var.role
27-
resource_key_tags = var.resource_key_tags
15+
source = "terraform-ibm-modules/observability/ibm//modules/logging-logdna"
16+
17+
bind_resource_key = var.bind_resource_key
18+
service_name = var.service_name
19+
resource_group_id = data.ibm_resource_group.logdna.id
20+
plan = var.plan
21+
region = var.region
22+
service_endpoints = var.service_endpoints
23+
parameters = var.parameters
24+
tags = var.tags
25+
create_timeout = var.create_timeout
26+
update_timeout = var.update_timeout
27+
delete_timeout = var.delete_timeout
28+
resource_key_name = var.resource_key_name
29+
role = var.role
30+
resource_key_tags = var.resource_key_tags
2831
}
2932
```
3033

@@ -44,4 +47,10 @@ module "logdna_instance" {
4447
| service\_endpoints | Possible values are 'public', 'private', 'public-and-private'. | string | n/a | no |
4548
| tags | Tags that should be applied to the service | list(string) | n/a | no |
4649
| resource_key_tags | Tags that should be applied to the resource key | list(string) | n/a | no |
50+
| parameters | Arbitrary parameters to pass | map(string) | n/a | no |
51+
| create_timeout | Timeout duration for create | string | n/a | no |
52+
| update_timeout | Timeout duration for update | string | n/a | no |
53+
| delete_timeout | Timeout duration for delete | string | n/a | no |
4754

55+
56+
NOTE: We can set the create, update and delete timeouts as string. For e.g say we want to set 15 minutes timeout then the value should be "15m".

‎examples/logging-logdna-instance/main.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ module "logdna_instance" {
1919
plan = var.plan
2020
region = var.region
2121
service_endpoints = var.service_endpoints
22+
parameters = var.parameters
2223
tags = var.tags
24+
create_timeout = var.create_timeout
25+
update_timeout = var.update_timeout
26+
delete_timeout = var.delete_timeout
2327
resource_key_name = var.resource_key_name
2428
role = var.role
2529
resource_key_tags = var.resource_key_tags

‎examples/logging-logdna-instance/variables.tf‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,31 @@ variable "region" {
2323
type = string
2424
}
2525

26+
variable "create_timeout" {
27+
type = string
28+
description = "Timeout duration for create."
29+
default = null
30+
}
31+
32+
variable "update_timeout" {
33+
type = string
34+
description = "Timeout duration for update."
35+
default = null
36+
}
37+
38+
variable "delete_timeout" {
39+
type = string
40+
description = "Timeout duration for delete."
41+
default = null
42+
}
43+
44+
variable "parameters" {
45+
type = map(string)
46+
description = "Arbitrary parameters to pass"
47+
default = null
48+
}
49+
50+
2651
variable "service_endpoints" {
2752
description = "Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'."
2853
type = string

‎examples/sysdig-instance/README.md‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,22 @@ data "ibm_resource_group" "sysdig" {
1212
}
1313
1414
module "sysdig_instance" {
15-
source = "terraform-ibm-modules/observability/ibm//modules/monitoring-sysdig"
16-
17-
bind_resource_key = var.bind_resource_key
18-
service_name = var.service_name
19-
resource_group_id = data.ibm_resource_group.sysdig.id
20-
plan = var.plan
21-
region = var.region
22-
service_endpoints = var.service_endpoints
23-
tags = var.tags
24-
resource_key_name = var.resource_key_name
25-
role = var.role
26-
resource_key_tags = var.resource_key_tags
15+
source = "terraform-ibm-modules/observability/ibm//modules/monitoring-sysdig"
16+
17+
bind_resource_key = var.bind_resource_key
18+
service_name = var.service_name
19+
resource_group_id = data.ibm_resource_group.sysdig.id
20+
plan = var.plan
21+
region = var.region
22+
service_endpoints = var.service_endpoints
23+
parameters = var.parameters
24+
tags = var.tags
25+
create_timeout = var.create_timeout
26+
update_timeout = var.update_timeout
27+
delete_timeout = var.delete_timeout
28+
resource_key_name = var.resource_key_name
29+
role = var.role
30+
resource_key_tags = var.resource_key_tags
2731
}
2832
```
2933

@@ -43,3 +47,9 @@ module "sysdig_instance" {
4347
| service\_endpoints | Possible values are 'public', 'private', 'public-and-private'. | string | n/a | no |
4448
| tags | Tags that should be applied to the service | list(string) | n/a | no |
4549
| resource_key_tags | Tags that should be applied to the service key | list(string) | n/a | no |
50+
| parameters | Arbitrary parameters to pass | map(string) | n/a | no |
51+
| create_timeout | Timeout duration for create | string | n/a | no |
52+
| update_timeout | Timeout duration for update | string | n/a | no |
53+
| delete_timeout | Timeout duration for delete | string | n/a | no |
54+
55+
NOTE: We can set the create, update and delete timeouts as string. For e.g say we want to set 15 minutes timeout then the value should be "15m".

‎examples/sysdig-instance/main.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ module "sysdig_instance" {
1919
plan = var.plan
2020
region = var.region
2121
service_endpoints = var.service_endpoints
22+
parameters = var.parameters
2223
tags = var.tags
24+
create_timeout = var.create_timeout
25+
update_timeout = var.update_timeout
26+
delete_timeout = var.delete_timeout
2327
resource_key_name = var.resource_key_name
2428
role = var.role
2529
resource_key_tags = var.resource_key_tags

‎examples/sysdig-instance/variables.tf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,30 @@ variable "plan" {
1818
type = string
1919
}
2020

21+
variable "create_timeout" {
22+
type = string
23+
description = "Timeout duration for create."
24+
default = null
25+
}
26+
27+
variable "update_timeout" {
28+
type = string
29+
description = "Timeout duration for update."
30+
default = null
31+
}
32+
33+
variable "delete_timeout" {
34+
type = string
35+
description = "Timeout duration for delete."
36+
default = null
37+
}
38+
39+
variable "parameters" {
40+
type = map(string)
41+
description = "Arbitrary parameters to pass"
42+
default = null
43+
}
44+
2145
variable "resource_group" {
2246
description = "Enter resource group name"
2347
type = string

0 commit comments

Comments
 (0)