Skip to content

Commit 22bfc73

Browse files
authored
fix entity_label in logs_alert_Definition resource (#6554)
1 parent c23b9fc commit 22bfc73

File tree

3 files changed

+62
-11
lines changed

3 files changed

+62
-11
lines changed

ibm/service/logs/resource_ibm_logs_alert_definition.go

Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,7 +3172,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototype(modelMap map[st
31723172
model.NotificationGroup = NotificationGroupModel
31733173
}
31743174
if modelMap["entity_labels"] != nil {
3175-
// TODO: handle EntityLabels, map with entry type 'string'
3175+
entityLabelsModel := map[string]string{}
3176+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3177+
entityLabelsModel[key] = value.(string)
3178+
}
3179+
model.EntityLabels = entityLabelsModel
31763180
}
31773181
if modelMap["phantom_mode"] != nil {
31783182
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3295,7 +3299,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
32953299
model.NotificationGroup = NotificationGroupModel
32963300
}
32973301
if modelMap["entity_labels"] != nil {
3298-
// TODO: handle EntityLabels, map with entry type 'string'
3302+
entityLabelsModel := map[string]string{}
3303+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3304+
entityLabelsModel[key] = value.(string)
3305+
}
3306+
model.EntityLabels = entityLabelsModel
32993307
}
33003308
if modelMap["phantom_mode"] != nil {
33013309
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3355,7 +3363,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
33553363
model.NotificationGroup = NotificationGroupModel
33563364
}
33573365
if modelMap["entity_labels"] != nil {
3358-
// TODO: handle EntityLabels, map with entry type 'string'
3366+
entityLabelsModel := map[string]string{}
3367+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3368+
entityLabelsModel[key] = value.(string)
3369+
}
3370+
model.EntityLabels = entityLabelsModel
33593371
}
33603372
if modelMap["phantom_mode"] != nil {
33613373
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3415,7 +3427,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
34153427
model.NotificationGroup = NotificationGroupModel
34163428
}
34173429
if modelMap["entity_labels"] != nil {
3418-
// TODO: handle EntityLabels, map with entry type 'string'
3430+
entityLabelsModel := map[string]string{}
3431+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3432+
entityLabelsModel[key] = value.(string)
3433+
}
3434+
model.EntityLabels = entityLabelsModel
34193435
}
34203436
if modelMap["phantom_mode"] != nil {
34213437
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3475,7 +3491,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
34753491
model.NotificationGroup = NotificationGroupModel
34763492
}
34773493
if modelMap["entity_labels"] != nil {
3478-
// TODO: handle EntityLabels, map with entry type 'string'
3494+
entityLabelsModel := map[string]string{}
3495+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3496+
entityLabelsModel[key] = value.(string)
3497+
}
3498+
model.EntityLabels = entityLabelsModel
34793499
}
34803500
if modelMap["phantom_mode"] != nil {
34813501
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3535,7 +3555,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
35353555
model.NotificationGroup = NotificationGroupModel
35363556
}
35373557
if modelMap["entity_labels"] != nil {
3538-
// TODO: handle EntityLabels, map with entry type 'string'
3558+
entityLabelsModel := map[string]string{}
3559+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3560+
entityLabelsModel[key] = value.(string)
3561+
}
3562+
model.EntityLabels = entityLabelsModel
35393563
}
35403564
if modelMap["phantom_mode"] != nil {
35413565
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3595,7 +3619,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
35953619
model.NotificationGroup = NotificationGroupModel
35963620
}
35973621
if modelMap["entity_labels"] != nil {
3598-
// TODO: handle EntityLabels, map with entry type 'string'
3622+
entityLabelsModel := map[string]string{}
3623+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3624+
entityLabelsModel[key] = value.(string)
3625+
}
3626+
model.EntityLabels = entityLabelsModel
35993627
}
36003628
if modelMap["phantom_mode"] != nil {
36013629
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3655,7 +3683,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
36553683
model.NotificationGroup = NotificationGroupModel
36563684
}
36573685
if modelMap["entity_labels"] != nil {
3658-
// TODO: handle EntityLabels, map with entry type 'string'
3686+
entityLabelsModel := map[string]string{}
3687+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3688+
entityLabelsModel[key] = value.(string)
3689+
}
3690+
model.EntityLabels = entityLabelsModel
36593691
}
36603692
if modelMap["phantom_mode"] != nil {
36613693
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3715,7 +3747,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
37153747
model.NotificationGroup = NotificationGroupModel
37163748
}
37173749
if modelMap["entity_labels"] != nil {
3718-
// TODO: handle EntityLabels, map with entry type 'string'
3750+
entityLabelsModel := map[string]string{}
3751+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3752+
entityLabelsModel[key] = value.(string)
3753+
}
3754+
model.EntityLabels = entityLabelsModel
37193755
}
37203756
if modelMap["phantom_mode"] != nil {
37213757
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3775,7 +3811,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
37753811
model.NotificationGroup = NotificationGroupModel
37763812
}
37773813
if modelMap["entity_labels"] != nil {
3778-
// TODO: handle EntityLabels, map with entry type 'string'
3814+
entityLabelsModel := map[string]string{}
3815+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3816+
entityLabelsModel[key] = value.(string)
3817+
}
3818+
model.EntityLabels = entityLabelsModel
37793819
}
37803820
if modelMap["phantom_mode"] != nil {
37813821
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))
@@ -3835,7 +3875,11 @@ func ResourceIbmLogsAlertDefinitionMapToAlertDefinitionPrototypeApisAlertDefinit
38353875
model.NotificationGroup = NotificationGroupModel
38363876
}
38373877
if modelMap["entity_labels"] != nil {
3838-
// TODO: handle EntityLabels, map with entry type 'string'
3878+
entityLabelsModel := map[string]string{}
3879+
for key, value := range modelMap["entity_labels"].(map[string]interface{}) {
3880+
entityLabelsModel[key] = value.(string)
3881+
}
3882+
model.EntityLabels = entityLabelsModel
38393883
}
38403884
if modelMap["phantom_mode"] != nil {
38413885
model.PhantomMode = core.BoolPtr(modelMap["phantom_mode"].(bool))

website/docs/r/logs_alert_definition.html.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ resource "ibm_logs_alert_definition" "standard_immediate" {
2929
minutes = 10
3030
notify_on = "triggered_only_unspecified"
3131
}
32+
entity_labels = {
33+
key = "value"
34+
key2 = "value2"
35+
}
3236
logs_immediate {
3337
notification_payload_filter = []
3438

website/docs/r/logs_policy.html.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ resource "ibm_logs_policy" "logs_policy_instance" {
2727
log_rules {
2828
severities = ["info"]
2929
}
30+
before {
31+
id = "3dc02998-0b50-4ea8-b68a-4779d716fa1f"
32+
}
3033
}
3134
```
3235

0 commit comments

Comments
 (0)