Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_monitor_action_group - fix method to check exactly one of event_hub_id or (event_hub_namespace, event_hub_name) must be set in event_hub_receiver #21735

Merged
merged 2 commits into from
May 10, 2023
Merged

azurerm_monitor_action_group - fix method to check exactly one of event_hub_id or (event_hub_namespace, event_hub_name) must be set in event_hub_receiver #21735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc248c
fix eventhub receiver
teowa May 10, 2023
1de1680
fix check hasset in nested block
teowa May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions internal/services/monitor/monitor_action_group_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,8 @@ func resourceMonitorActionGroupCreateUpdate(d *pluginsdk.ResourceData, meta inte
logicAppReceiversRaw := d.Get("logic_app_receiver").([]interface{})
azureFunctionReceiversRaw := d.Get("azure_function_receiver").([]interface{})
armRoleReceiversRaw := d.Get("arm_role_receiver").([]interface{})
eventHubReceiversRaw := d.Get("event_hub_receiver").([]interface{})

expandedEventHubReceiver, err := expandMonitorActionGroupEventHubReceiver(tenantId, subscriptionId, eventHubReceiversRaw)
expandedEventHubReceiver, err := expandMonitorActionGroupEventHubReceiver(tenantId, subscriptionId, d)
if err != nil {
return err
}
Expand Down Expand Up @@ -842,21 +841,41 @@ func expandMonitorActionGroupRoleReceiver(v []interface{}) *[]actiongroupsapis.A
return &receivers
}

func expandMonitorActionGroupEventHubReceiver(tenantId string, subscriptionId string, v []interface{}) (*[]actiongroupsapis.EventHubReceiver, error) {
func expandMonitorActionGroupEventHubReceiver(tenantId string, subscriptionId string, d *pluginsdk.ResourceData) (*[]actiongroupsapis.EventHubReceiver, error) {
receivers := make([]actiongroupsapis.EventHubReceiver, 0)
for _, receiverValue := range v {
eventHubReceiver := d.Get("event_hub_receiver").([]interface{})
for i, receiverValue := range eventHubReceiver {
val := receiverValue.(map[string]interface{})

eventHubNameSpace, eventHubName, subId := val["event_hub_namespace"].(string), val["event_hub_name"].(string), val["subscription_id"].(string)

if !features.FourPointOhBeta() {
if eventHubNameSpace == "" && eventHubName == "" && subId == "" && val["event_hub_id"].(string) != "" {
eventHubId, err := eventhubs.ParseEventhubID(*utils.String(val["event_hub_id"].(string)))
eventHubReceiverRaw := d.GetRawConfig().AsValueMap()["event_hub_receiver"].AsValueSlice()[i].AsValueMap()
eventHubIdRaw := eventHubReceiverRaw["event_hub_id"]

hasSetId := !eventHubIdRaw.IsNull()
hasSetName := !eventHubReceiverRaw["event_hub_name"].IsNull()
hasSetNamespace := !eventHubReceiverRaw["event_hub_namespace"].IsNull()
hasSetSubscriptionId := !eventHubReceiverRaw["subscription_id"].IsNull()

if hasSetName != hasSetNamespace {
return nil, fmt.Errorf("in event_hub_receiver, event_hub_name and event_hub_namespace must be set together")
}

if hasSetId == hasSetName {
return nil, fmt.Errorf("in event_hub_receiver, exactly one of event_hub_id or (event_hub_namespace, event_hub_name) must be set")
}

if hasSetId && hasSetSubscriptionId {
return nil, fmt.Errorf("in event_hub_receiver, event_hub_id and subscription_id cannot be set together")
}

if hasSetId {
eventHubId, err := eventhubs.ParseEventhubID(eventHubIdRaw.AsString())
if err != nil {
return nil, err
}
eventHubNameSpace, eventHubName, subId = eventHubId.NamespaceName, eventHubId.EventhubName, eventHubId.SubscriptionId
} else if val["event_hub_id"].(string) != "" || eventHubNameSpace == "" || eventHubName == "" {
return nil, fmt.Errorf("in event_hub_receiver, exactly one of event_hub_id or (event_hub_namespace, event_hub_name) must be set")
}
}

Expand All @@ -866,16 +885,19 @@ func expandMonitorActionGroupEventHubReceiver(tenantId string, subscriptionId st
Name: val["name"].(string),
UseCommonAlertSchema: utils.Bool(val["use_common_alert_schema"].(bool)),
}

if v := val["tenant_id"].(string); v != "" {
receiver.TenantId = utils.String(v)
} else {
receiver.TenantId = utils.String(tenantId)
}

if subId != "" {
receiver.SubscriptionId = subId
} else {
receiver.SubscriptionId = subscriptionId
}

receivers = append(receivers, receiver)
}
return &receivers, nil
Expand Down