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.

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

New Resource: azurerm_monitor_action_group #1725

Merged
merged 17 commits into from
Aug 10, 2018
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
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
5 changes: 5 additions & 0 deletions azurerm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ type ArmClient struct {
logicWorkflowsClient logic.WorkflowsClient

// Monitor
actionGroupsClient insights.ActionGroupsClient
monitorAlertRulesClient insights.AlertRulesClient

// MSI
Expand Down Expand Up @@ -772,6 +773,10 @@ func (c *ArmClient) registerLogicClients(endpoint, subscriptionId string, auth a
}

func (c *ArmClient) registerMonitorClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
actionGroupsClient := insights.NewActionGroupsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&actionGroupsClient.Client, auth)
c.actionGroupsClient = actionGroupsClient

arc := insights.NewAlertRulesClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&arc.Client)
arc.Authorizer = auth
Expand Down
1 change: 1 addition & 0 deletions azurerm/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func Provider() terraform.ResourceProvider {
},

ResourcesMap: map[string]*schema.Resource{
"azurerm_monitor_action_group": resourceArmMonitorActionGroup(),
Copy link
Contributor

@tombuildsstuff tombuildsstuff Aug 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we sort this alphabetically like the rest of the resources? #Resolved

"azurerm_azuread_application": resourceArmActiveDirectoryApplication(),
"azurerm_azuread_service_principal": resourceArmActiveDirectoryServicePrincipal(),
"azurerm_azuread_service_principal_password": resourceArmActiveDirectoryServicePrincipalPassword(),
Expand Down
315 changes: 315 additions & 0 deletions azurerm/resource_arm_monitor_action_group.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,315 @@
package azurerm

import (
"fmt"

"github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

func resourceArmMonitorActionGroup() *schema.Resource {
return &schema.Resource{
Create: resourceArmMonitorActionGroupCreateOrUpdate,
Read: resourceArmMonitorActionGroupRead,
Update: resourceArmMonitorActionGroupCreateOrUpdate,
Delete: resourceArmMonitorActionGroupDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.NoZeroValues,
},

"resource_group_name": resourceGroupNameSchema(),

"short_name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
Copy link
Contributor

@tombuildsstuff tombuildsstuff Aug 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this string can be a maximum of 12 characters long, we should add validation to support this #Resolved

},

"enabled": {
Type: schema.TypeBool,
Optional: true,
Default: true,
},

"email_receiver": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
},
"email_address": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
},
},
},
},

"sms_receiver": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
},
"country_code": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
},
"phone_number": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
},
},
},
},

"webhook_receiver": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
},
"service_uri": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
},
},
},
},

"tags": tagsSchema(),
},
}
}

func resourceArmMonitorActionGroupCreateOrUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).actionGroupsClient
ctx := meta.(*ArmClient).StopContext

name := d.Get("name").(string)
resGroup := d.Get("resource_group_name").(string)

shortName := d.Get("short_name").(string)
enabled := d.Get("enabled").(bool)

emailReceiversRaw := d.Get("email_receiver").([]interface{})
smsReceiversRaw := d.Get("sms_receiver").([]interface{})
webhookReceiversRaw := d.Get("webhook_receiver").([]interface{})

tags := d.Get("tags").(map[string]interface{})
expandedTags := expandTags(tags)

parameters := insights.ActionGroupResource{
Location: utils.String(azureRMNormalizeLocation("Global")),
ActionGroup: &insights.ActionGroup{
GroupShortName: &shortName,
Enabled: &enabled,
Copy link
Contributor

@tombuildsstuff tombuildsstuff Aug 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should update these to be these utils.String(shortName) and utils.Bool(enabled) respectively #Resolved

EmailReceivers: expandMonitorActionGroupEmailReceiver(emailReceiversRaw),
SmsReceivers: expandMonitorActionGroupSmsReceiver(smsReceiversRaw),
WebhookReceivers: expandMonitorActionGroupWebHookReceiver(webhookReceiversRaw),
},
Tags: expandedTags,
}

_, err := client.CreateOrUpdate(ctx, resGroup, name, parameters)
if err != nil {
return fmt.Errorf("Error creating or updating action group %q (resource group %q): %+v", name, resGroup, err)
}

read, err := client.Get(ctx, resGroup, name)
if err != nil {
return fmt.Errorf("Error getting action group %q (resource group %q) after creation: %+v", name, resGroup, err)
}
if read.ID == nil {
return fmt.Errorf("Action group %q (resource group %q) ID is empty", name, resGroup)
}

d.SetId(*read.ID)

return resourceArmMonitorActionGroupRead(d, meta)
}

func resourceArmMonitorActionGroupRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).actionGroupsClient
ctx := meta.(*ArmClient).StopContext

id, err := parseAzureResourceID(d.Id())
if err != nil {
return err
}
resGroup := id.ResourceGroup
name := id.Path["actionGroups"]

resp, err := client.Get(ctx, resGroup, name)
if err != nil {
if response.WasNotFound(resp.Response.Response) {
d.SetId("")
return nil
}
return fmt.Errorf("Error getting action group %q (resource group %q): %+v", name, resGroup, err)
}

d.Set("name", name)
d.Set("resource_group_name", resGroup)

d.Set("short_name", resp.ActionGroup.GroupShortName)
Copy link
Contributor

@tombuildsstuff tombuildsstuff Aug 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if ActionGroup is nil here this'll crash; as such this needs to become:

if group := resp.ActionGroup; group != nil {
  d.Set("short_name", group.GroupShortName)
  d.Set("enabled", group.Enabled)

  emailReceivers := flattenMonitorActionGroupEmailReceiver(group.EmailReceivers)
  if err = d.Set("email_receiver", emailReceivers); err != nil {
    return fmt.Errorf("Error flattening `email_receiver`: %+v", err)
  }

  smsReceivers := flattenMonitorActionGroupSmsReceiver(group.SmsReceivers)
  if err = d.Set("sms_receiver", smsReceivers); err != nil {
    return fmt.Errorf("Error setting `sms_receiver`: %+v", err)
  }

  webhookReceivers := flattenMonitorActionGroupWebHookReceiver(group.WebhookReceivers)
  if err = d.Set("webhook_receiver", webhookReceivers); err != nil {
    return fmt.Errorf("Error setting `webhook_receiver`: %+v", err)
  }
}

(I've also fixed the error messages here, since the name/resource group aren't helpful in this context #Resolved

d.Set("enabled", resp.ActionGroup.Enabled)

if err = d.Set("email_receiver", flattenMonitorActionGroupEmailReceiver(resp.ActionGroup.EmailReceivers)); err != nil {
return fmt.Errorf("Error setting `email_receiver` of action group %q (resource group %q): %+v", name, resGroup, err)
}

if err = d.Set("sms_receiver", flattenMonitorActionGroupSmsReceiver(resp.ActionGroup.SmsReceivers)); err != nil {
return fmt.Errorf("Error setting `sms_receiver` of action group %q (resource group %q): %+v", name, resGroup, err)
}

if err = d.Set("webhook_receiver", flattenMonitorActionGroupWebHookReceiver(resp.ActionGroup.WebhookReceivers)); err != nil {
return fmt.Errorf("Error setting `webhook_receiver` of action group %q (resource group %q): %+v", name, resGroup, err)
}

flattenAndSetTags(d, resp.Tags)

return nil
}

func resourceArmMonitorActionGroupDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).actionGroupsClient
ctx := meta.(*ArmClient).StopContext

id, err := parseAzureResourceID(d.Id())
if err != nil {
return err
}
resGroup := id.ResourceGroup
name := id.Path["actionGroups"]

resp, err := client.Delete(ctx, resGroup, name)
if err != nil {
if !response.WasNotFound(resp.Response) {
return fmt.Errorf("Error deleting action group %q (resource group %q): %+v", name, resGroup, err)
}
}

return nil
}

func expandMonitorActionGroupEmailReceiver(v []interface{}) *[]insights.EmailReceiver {
receivers := make([]insights.EmailReceiver, 0)
for _, receiverValue := range v {
val := receiverValue.(map[string]interface{})
receiver := insights.EmailReceiver{
Name: utils.String(val["name"].(string)),
EmailAddress: utils.String(val["email_address"].(string)),
}
receivers = append(receivers, receiver)
}
return &receivers
}

func expandMonitorActionGroupSmsReceiver(v []interface{}) *[]insights.SmsReceiver {
receivers := make([]insights.SmsReceiver, 0)
for _, receiverValue := range v {
val := receiverValue.(map[string]interface{})
receiver := insights.SmsReceiver{
Name: utils.String(val["name"].(string)),
CountryCode: utils.String(val["country_code"].(string)),
PhoneNumber: utils.String(val["phone_number"].(string)),
}
receivers = append(receivers, receiver)
}
return &receivers
}

func expandMonitorActionGroupWebHookReceiver(v []interface{}) *[]insights.WebhookReceiver {
receivers := make([]insights.WebhookReceiver, 0)
for _, receiverValue := range v {
val := receiverValue.(map[string]interface{})
receiver := insights.WebhookReceiver{
Name: utils.String(val["name"].(string)),
ServiceURI: utils.String(val["service_uri"].(string)),
}
receivers = append(receivers, receiver)
}
return &receivers
}

func flattenMonitorActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) []interface{} {
result := make([]interface{}, 0)
if receivers != nil {
for _, receiver := range *receivers {
val := make(map[string]interface{}, 0)
if receiver.Name != nil {
val["name"] = *receiver.Name
}
if receiver.EmailAddress != nil {
val["email_address"] = *receiver.EmailAddress
}
result = append(result, val)
}
}
return result
}

func flattenMonitorActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []interface{} {
result := make([]interface{}, 0)
if receivers != nil {
for _, receiver := range *receivers {
val := make(map[string]interface{}, 0)
if receiver.Name != nil {
val["name"] = *receiver.Name
}
if receiver.CountryCode != nil {
val["country_code"] = *receiver.CountryCode
}
if receiver.PhoneNumber != nil {
val["phone_number"] = *receiver.PhoneNumber
}
result = append(result, val)
}
}
return result
}

func flattenMonitorActionGroupWebHookReceiver(receivers *[]insights.WebhookReceiver) []interface{} {
result := make([]interface{}, 0)
if receivers != nil {
for _, receiver := range *receivers {
val := make(map[string]interface{}, 0)
if receiver.Name != nil {
val["name"] = *receiver.Name
}
if receiver.ServiceURI != nil {
val["service_uri"] = *receiver.ServiceURI
}
result = append(result, val)
}
}
return result
}
Loading