From 1ec27cc0b6d44503e0a92652f0954f801023deda Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Wed, 20 Jun 2018 17:28:07 -0700 Subject: [PATCH 01/15] Add new Action Group resource of Azure Monitor --- azurerm/config.go | 5 + azurerm/provider.go | 1 + azurerm/resource_arm_action_group.go | 320 +++++++++++++++++++++++++++ 3 files changed, 326 insertions(+) create mode 100644 azurerm/resource_arm_action_group.go diff --git a/azurerm/config.go b/azurerm/config.go index fd23c447d24f..9cb3ab7577d5 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -147,6 +147,7 @@ type ArmClient struct { keyVaultManagementClient keyVault.BaseClient // Monitor + actionGroupsClient insights.ActionGroupsClient monitorAlertRulesClient insights.AlertRulesClient // Networking @@ -709,6 +710,10 @@ func (c *ArmClient) registerKeyVaultClients(endpoint, subscriptionId string, aut } 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 diff --git a/azurerm/provider.go b/azurerm/provider.go index d53daabbaf5a..96e79600f1e6 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -116,6 +116,7 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ + "azurerm_action_group": resourceArmActionGroup(), "azurerm_application_gateway": resourceArmApplicationGateway(), "azurerm_application_insights": resourceArmApplicationInsights(), "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), diff --git a/azurerm/resource_arm_action_group.go b/azurerm/resource_arm_action_group.go new file mode 100644 index 000000000000..bc7c0b1b74e6 --- /dev/null +++ b/azurerm/resource_arm_action_group.go @@ -0,0 +1,320 @@ +package azurerm + +import ( + "fmt" + + "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights" + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmActionGroup() *schema.Resource { + return &schema.Resource{ + Create: resourceArmActionGroupCreateOrUpdate, + Read: resourceArmActionGroupRead, + Update: resourceArmActionGroupCreateOrUpdate, + Delete: resourceArmActionGroupDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "location": locationSchema(), + "resource_group_name": resourceGroupNameSchema(), + + "short_name": { + Type: schema.TypeString, + Required: true, + }, + + "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, + }, + "email_address": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + + "sms_receiver": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "country_code": { + Type: schema.TypeString, + Required: true, + }, + "phone_number": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + + "webhook_receiver": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "service_uri": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + + "tags": tagsSchema(), + }, + } +} + +func resourceArmActionGroupCreateOrUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).actionGroupsClient + ctx := meta.(*ArmClient).StopContext + + name := d.Get("name").(string) + location := azureRMNormalizeLocation(d.Get("location").(string)) + resGroup := d.Get("resource_group_name").(string) + + shortName := d.Get("short_name").(string) + enabled := d.Get("enabled").(bool) + + tags := d.Get("tags").(map[string]interface{}) + expandedTags := expandTags(tags) + + parameters := insights.ActionGroupResource{ + Location: utils.String(location), + ActionGroup: &insights.ActionGroup{ + GroupShortName: utils.String(shortName), + Enabled: utils.Bool(enabled), + EmailReceivers: expandActionGroupEmailReceiver(d), + SmsReceivers: expandActionGroupSmsReceiver(d), + WebhookReceivers: expandActionGroupWebHookReceiver(d), + }, + Tags: expandedTags, + } + + _, err := client.CreateOrUpdate(ctx, resGroup, name, parameters) + if err != nil { + return fmt.Errorf("Error creating or updating action group %s (resource group %s): %+v", name, resGroup, err) + } + + read, err := client.Get(ctx, resGroup, name) + if err != nil { + return fmt.Errorf("Error getting action group %s (resource group %s) after creation: %+v", name, resGroup, err) + } + if read.ID == nil { + return fmt.Errorf("Action group %s (resource group %s) ID is empty", name, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmActionGroupRead(d, meta) +} + +func resourceArmActionGroupRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).actionGroupsClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return fmt.Errorf("Error parsing action group resource ID \"%s\" during get: %+v", d.Id(), 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 %s (resource group %s): %+v", name, resGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resGroup) + if location := resp.Location; location != nil { + d.Set("location", azureRMNormalizeLocation(*location)) + } + + d.Set("short_name", *resp.GroupShortName) + d.Set("enabled", *resp.Enabled) + + if err = d.Set("email_receiver", flattenActionGroupEmailReceiver(resp.EmailReceivers)); err != nil { + return fmt.Errorf("Error setting `email_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) + } + + if err = d.Set("sms_receiver", flattenActionGroupSmsReceiver(resp.SmsReceivers)); err != nil { + return fmt.Errorf("Error setting `sms_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) + } + + if err = d.Set("webhook_receiver", flattenActionGroupWebHookReceiver(resp.WebhookReceivers)); err != nil { + return fmt.Errorf("Error setting `webhook_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) + } + + flattenAndSetTags(d, resp.Tags) + + return nil +} + +func resourceArmActionGroupDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).actionGroupsClient + ctx := meta.(*ArmClient).StopContext + + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return fmt.Errorf("Error parsing action group resource ID \"%s\" during delete: %+v", d.Id(), err) + } + resGroup := id.ResourceGroup + name := id.Path["actionGroups"] + + resp, err := client.Delete(ctx, resGroup, name) + if err != nil { + if response.WasNotFound(resp.Response) { + return nil + } + return fmt.Errorf("Error deleting action group %s (resource group %s): %+v", name, resGroup, err) + } + + return nil +} + +func expandActionGroupEmailReceiver(d *schema.ResourceData) *[]insights.EmailReceiver { + v, ok := d.GetOk("email_receiver") + if !ok { + return nil + } + + receivers := make([]insights.EmailReceiver, 0) + for _, receiverValue := range v.([]interface{}) { + 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 flattenActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) []interface{} { + result := make([]interface{}, 0) + if receivers != nil { + for _, receiver := range *receivers { + val := make(map[string]interface{}, 0) + + val["name"] = *receiver.Name + val["email_address"] = *receiver.EmailAddress + + result = append(result, val) + } + } + return result +} + +func expandActionGroupSmsReceiver(d *schema.ResourceData) *[]insights.SmsReceiver { + v, ok := d.GetOk("sms_receiver") + if !ok { + return nil + } + + receivers := make([]insights.SmsReceiver, 0) + for _, receiverValue := range v.([]interface{}) { + 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 flattenActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []interface{} { + result := make([]interface{}, 0) + if receivers != nil { + for _, receiver := range *receivers { + val := make(map[string]interface{}, 0) + + val["name"] = *receiver.Name + val["country_code"] = *receiver.CountryCode + val["phone_number"] = *receiver.PhoneNumber + + result = append(result, val) + } + } + return result +} + +func expandActionGroupWebHookReceiver(d *schema.ResourceData) *[]insights.WebhookReceiver { + v, ok := d.GetOk("webhook_receiver") + if !ok { + return nil + } + + receivers := make([]insights.WebhookReceiver, 0) + for _, receiverValue := range v.([]interface{}) { + 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 flattenActionGroupWebHookReceiver(receivers *[]insights.WebhookReceiver) []interface{} { + result := make([]interface{}, 0) + if receivers != nil { + for _, receiver := range *receivers { + val := make(map[string]interface{}, 0) + + val["name"] = *receiver.Name + val["service_uri"] = *receiver.ServiceURI + + result = append(result, val) + } + } + return result +} From 4584f460d5d2539d1eedc830c7d64729a4cd8fb7 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 21 Jun 2018 15:37:09 -0700 Subject: [PATCH 02/15] Add documentation of azurerm_action_group --- website/docs/r/action_group.html.markdown | 99 +++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 website/docs/r/action_group.html.markdown diff --git a/website/docs/r/action_group.html.markdown b/website/docs/r/action_group.html.markdown new file mode 100644 index 000000000000..ffb1bc525cbf --- /dev/null +++ b/website/docs/r/action_group.html.markdown @@ -0,0 +1,99 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_action_group" +sidebar_current: "docs-azurerm-resource-action-group" +description: |- + Manages an Action Group of Azure monitoring service + +--- + +# azurerm_action_group + +Manages an Action Group of Azure monitoring service. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "test" { + name = "monitoring-resources" + location = "West US" +} + +resource "azurerm_action_group" "test" { + name = "CriticalAlertsAction" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "p0action" + + email_receiver { + name = "sendtoadmin" + email_address = "admin@contoso.com" + } + + email_receiver { + name = "sendtodevops" + email_address = "devops@contoso.com" + } + + sms_receiver { + name = "oncallmsg" + country_code = "1" + phone_number = "1231231234" + } + + webhook_receiver { + name = "callmyapiaswell" + service_uri = "http://example.com/alert" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the Action Group. Changing this forces a new resource to be created. +* `location` - (Required) The location of this Action Group. +* `resource_group_name` - (Required) The name of the resource group in which to create the Action Group instance. +* `short_name` - (Required) The short name of the action group. This will be used in SMS messages. +* `enabled` - (Optional) Whether this action group is enabled. If an action group is not enabled, then none of its receivers will receive communications. Defaults to `true`. +* `email_receiver` - (Optional) The list of `email_receiver` blocks as defined below that are part of this action group. +* `sms_receiver` - (Optional) The list of `sms_receiver` blocks as defined below that are part of this action group. +* `webhook_receiver` - (Optional) The list of `webhook_receiver` blocks as defined below that are part of this action group. +* `tags` - (Optional) A mapping of tags to assign to the resource. + +--- + +`email_receiver` supports the following: + +* `name` - (Required) The name of the email receiver. Names must be unique (case-insensitive) across all receivers within an action group. +* `email_address` - (Required) The email address of this receiver. + +--- + +`sms_receiver` supports the following: + +* `name` - (Required) The name of the SMS receiver. Names must be unique (case-insensitive) across all receivers within an action group. +* `country_code` - (Required) The country code of the SMS receiver. +* `phone_number` - (Required) The phone number of the SMS receiver. + +--- + +`webhook_receiver` supports the following: + +* `name` - (Required) The name of the webhook receiver. Names must be unique (case-insensitive) across all receivers within an action group. +* `service_uri` - (Required) The URI where webhooks should be sent. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Route ID. + +## Import + +Action Groups can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_action_group.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/actionGroups/myagname +``` From 24ed6acf8bd34afebfbef10e48ae27c77dbc08fa Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 21 Jun 2018 16:52:31 -0700 Subject: [PATCH 03/15] Fix location description in documentation. --- website/docs/r/action_group.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/action_group.html.markdown b/website/docs/r/action_group.html.markdown index ffb1bc525cbf..5a19c9396bfa 100644 --- a/website/docs/r/action_group.html.markdown +++ b/website/docs/r/action_group.html.markdown @@ -21,7 +21,7 @@ resource "azurerm_resource_group" "test" { resource "azurerm_action_group" "test" { name = "CriticalAlertsAction" - location = "${azurerm_resource_group.test.location}" + location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" short_name = "p0action" @@ -53,7 +53,7 @@ resource "azurerm_action_group" "test" { The following arguments are supported: * `name` - (Required) The name of the Action Group. Changing this forces a new resource to be created. -* `location` - (Required) The location of this Action Group. +* `location` - (Required) The location of this Action Group. The only possible value is `Global`. * `resource_group_name` - (Required) The name of the resource group in which to create the Action Group instance. * `short_name` - (Required) The short name of the action group. This will be used in SMS messages. * `enabled` - (Optional) Whether this action group is enabled. If an action group is not enabled, then none of its receivers will receive communications. Defaults to `true`. From 3c89f4a3c676dae33e24ff29d00cacfdb16ea8e7 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 21 Jun 2018 17:03:58 -0700 Subject: [PATCH 04/15] Add azurerm_action_group page to the ToC --- website/azurerm.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/azurerm.erb b/website/azurerm.erb index 5bfedaffc186..a8b56432e4a0 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -578,6 +578,10 @@ > Monitor Resources
    + > + azurerm_action_group + + > azurerm_metric_alertrule From 1f3eba2770e78bfdbd0e3f2db427635504fbd573 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 21 Jun 2018 17:37:09 -0700 Subject: [PATCH 05/15] Add acceptance tests for azurerm_action_group --- azurerm/resource_arm_action_group_test.go | 227 ++++++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 azurerm/resource_arm_action_group_test.go diff --git a/azurerm/resource_arm_action_group_test.go b/azurerm/resource_arm_action_group_test.go new file mode 100644 index 000000000000..da86e90ac28d --- /dev/null +++ b/azurerm/resource_arm_action_group_test.go @@ -0,0 +1,227 @@ +package azurerm + +import ( + "fmt" + "net/http" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAzureRMActionGroup_basic(t *testing.T) { + resourceName := "azurerm_action_group.test" + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_basic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.0.email_address", "admin@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.1.email_address", "devops@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "1"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.country_code", "1"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.phone_number", "1231231234"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "1"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.0.service_uri", "http://example.com/alert"), + ), + }, + }, + }) +} + +func TestAccAzureRMActionGroup_empty(t *testing.T) { + resourceName := "azurerm_action_group.test" + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_empty(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + ), + }, + }, + }) +} + +func TestAccAzureRMActionGroup_disabledEmpty(t *testing.T) { + resourceName := "azurerm_action_group.test" + ri := acctest.RandInt() + location := testLocation() + preConfig := testAccAzureRMActionGroup_disabledEmpty(ri, location) + postConfig := testAccAzureRMActionGroup_empty(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "false"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + ), + }, + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "false"), + ), + }, + }, + }) +} + +func testAccAzureRMActionGroup_basic(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_action_group" "test" { + name = "acctestActionGroup-%d" + location = "Global" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" + + email_receiver { + name = "sendtoadmin" + email_address = "admin@contoso.com" + } + + email_receiver { + name = "sendtodevops" + email_address = "devops@contoso.com" + } + + sms_receiver { + name = "oncallmsg" + country_code = "1" + phone_number = "1231231234" + } + + webhook_receiver { + name = "callmyapiaswell" + service_uri = "http://example.com/alert" + } +} +`, rInt, location, rInt) +} + +func testAccAzureRMActionGroup_empty(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_action_group" "test" { + name = "acctestActionGroup-%d" + location = "Global" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} +`, rInt, location, rInt) +} + +func testAccAzureRMActionGroup_disabledEmpty(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_action_group" "test" { + name = "acctestActionGroup-%d" + location = "Global" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" + enabled = false +} +`, rInt, location, rInt) +} + +func testCheckAzureRMActionGroupDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*ArmClient).actionGroupsClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_action_group" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := conn.Get(ctx, resourceGroup, name) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Action Group still exists:\n%#v", resp) + } + } + + return nil +} + +func testCheckAzureRMActionGroupExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + resourceName := rs.Primary.Attributes["name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Action Group Instance: %s", resourceName) + } + + conn := testAccProvider.Meta().(*ArmClient).actionGroupsClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := conn.Get(ctx, resourceGroup, resourceName) + if err != nil { + return fmt.Errorf("Bad: Get on actionGroupsClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Action Group Instance %q (resource group: %q) does not exist", resourceName, resourceGroup) + } + + return nil + } +} From d2f5e65b8d780db115f07a529123e7608925e60b Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 21 Jun 2018 18:32:17 -0700 Subject: [PATCH 06/15] Add import tests for azurerm_action_group --- azurerm/import_arm_action_group_test.go | 77 +++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 azurerm/import_arm_action_group_test.go diff --git a/azurerm/import_arm_action_group_test.go b/azurerm/import_arm_action_group_test.go new file mode 100644 index 000000000000..45422a283ace --- /dev/null +++ b/azurerm/import_arm_action_group_test.go @@ -0,0 +1,77 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMActionGroup_importBasic(t *testing.T) { + resourceName := "azurerm_action_group.test" + + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_basic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMActionGroup_importEmpty(t *testing.T) { + resourceName := "azurerm_action_group.test" + + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_empty(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMActionGroup_importDisabledEmpty(t *testing.T) { + resourceName := "azurerm_action_group.test" + + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_disabledEmpty(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} From 21e11831c3b795404bc81e45dc321bd3e4efb824 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Wed, 11 Jul 2018 16:18:37 -0700 Subject: [PATCH 07/15] Add action group resource back to providers. --- azurerm/provider.go | 909 ++++++++++++++++++++++---------------------- 1 file changed, 455 insertions(+), 454 deletions(-) diff --git a/azurerm/provider.go b/azurerm/provider.go index ff4e5951b50f..f96850310e8a 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -1,454 +1,455 @@ -package azurerm - -import ( - "context" - "crypto/sha1" - "encoding/base64" - "encoding/hex" - "fmt" - "log" - "strings" - "sync" - - "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources" - "github.com/Azure/go-autorest/autorest/adal" - "github.com/hashicorp/terraform/helper/mutexkv" - "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/authentication" - azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/schema" -) - -// Provider returns a terraform.ResourceProvider. -func Provider() terraform.ResourceProvider { - var p *schema.Provider - p = &schema.Provider{ - Schema: map[string]*schema.Schema{ - "subscription_id": { - Type: schema.TypeString, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_SUBSCRIPTION_ID", ""), - }, - - "client_id": { - Type: schema.TypeString, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_CLIENT_ID", ""), - }, - - "client_secret": { - Type: schema.TypeString, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_CLIENT_SECRET", ""), - }, - - "tenant_id": { - Type: schema.TypeString, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_TENANT_ID", ""), - }, - - "environment": { - Type: schema.TypeString, - Required: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_ENVIRONMENT", "public"), - }, - - "skip_credentials_validation": { - Type: schema.TypeBool, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_SKIP_CREDENTIALS_VALIDATION", false), - }, - - "skip_provider_registration": { - Type: schema.TypeBool, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_SKIP_PROVIDER_REGISTRATION", false), - }, - "use_msi": { - Type: schema.TypeBool, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_USE_MSI", false), - }, - "msi_endpoint": { - Type: schema.TypeString, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ARM_MSI_ENDPOINT", ""), - }, - }, - - DataSourcesMap: map[string]*schema.Resource{ - "azurerm_application_security_group": dataSourceArmApplicationSecurityGroup(), - "azurerm_app_service": dataSourceArmAppService(), - "azurerm_app_service_plan": dataSourceAppServicePlan(), - "azurerm_builtin_role_definition": dataSourceArmBuiltInRoleDefinition(), - "azurerm_cdn_profile": dataSourceArmCdnProfile(), - "azurerm_client_config": dataSourceArmClientConfig(), - "azurerm_cosmosdb_account": dataSourceArmCosmosDBAccount(), - "azurerm_data_lake_store": dataSourceArmDataLakeStoreAccount(), - "azurerm_dns_zone": dataSourceArmDnsZone(), - "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), - "azurerm_image": dataSourceArmImage(), - "azurerm_key_vault": dataSourceArmKeyVault(), - "azurerm_key_vault_access_policy": dataSourceArmKeyVaultAccessPolicy(), - "azurerm_key_vault_secret": dataSourceArmKeyVaultSecret(), - "azurerm_kubernetes_cluster": dataSourceArmKubernetesCluster(), - "azurerm_managed_disk": dataSourceArmManagedDisk(), - "azurerm_network_interface": dataSourceArmNetworkInterface(), - "azurerm_network_security_group": dataSourceArmNetworkSecurityGroup(), - "azurerm_platform_image": dataSourceArmPlatformImage(), - "azurerm_public_ip": dataSourceArmPublicIP(), - "azurerm_public_ips": dataSourceArmPublicIPs(), - "azurerm_recovery_services_vault": dataSourceArmRecoveryServicesVault(), - "azurerm_resource_group": dataSourceArmResourceGroup(), - "azurerm_role_definition": dataSourceArmRoleDefinition(), - "azurerm_route_table": dataSourceArmRouteTable(), - "azurerm_scheduler_job_collection": dataSourceArmSchedulerJobCollection(), - "azurerm_snapshot": dataSourceArmSnapshot(), - "azurerm_storage_account": dataSourceArmStorageAccount(), - "azurerm_storage_account_sas": dataSourceArmStorageAccountSharedAccessSignature(), - "azurerm_subnet": dataSourceArmSubnet(), - "azurerm_subscription": dataSourceArmSubscription(), - "azurerm_subscriptions": dataSourceArmSubscriptions(), - "azurerm_traffic_manager_geographical_location": dataSourceArmTrafficManagerGeographicalLocation(), - "azurerm_virtual_network": dataSourceArmVirtualNetwork(), - "azurerm_virtual_network_gateway": dataSourceArmVirtualNetworkGateway(), - }, - - ResourcesMap: map[string]*schema.Resource{ - "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), - "azurerm_application_gateway": resourceArmApplicationGateway(), - "azurerm_application_insights": resourceArmApplicationInsights(), - "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), - "azurerm_app_service": resourceArmAppService(), - "azurerm_app_service_plan": resourceArmAppServicePlan(), - "azurerm_app_service_active_slot": resourceArmAppServiceActiveSlot(), - "azurerm_app_service_custom_hostname_binding": resourceArmAppServiceCustomHostnameBinding(), - "azurerm_app_service_slot": resourceArmAppServiceSlot(), - "azurerm_automation_account": resourceArmAutomationAccount(), - "azurerm_automation_credential": resourceArmAutomationCredential(), - "azurerm_automation_runbook": resourceArmAutomationRunbook(), - "azurerm_automation_schedule": resourceArmAutomationSchedule(), - "azurerm_availability_set": resourceArmAvailabilitySet(), - "azurerm_cdn_endpoint": resourceArmCdnEndpoint(), - "azurerm_cdn_profile": resourceArmCdnProfile(), - "azurerm_container_registry": resourceArmContainerRegistry(), - "azurerm_container_service": resourceArmContainerService(), - "azurerm_container_group": resourceArmContainerGroup(), - "azurerm_cosmosdb_account": resourceArmCosmosDBAccount(), - "azurerm_data_lake_store": resourceArmDataLakeStore(), - "azurerm_data_lake_store_firewall_rule": resourceArmDataLakeStoreFirewallRule(), - "azurerm_dns_a_record": resourceArmDnsARecord(), - "azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(), - "azurerm_dns_caa_record": resourceArmDnsCaaRecord(), - "azurerm_dns_cname_record": resourceArmDnsCNameRecord(), - "azurerm_dns_mx_record": resourceArmDnsMxRecord(), - "azurerm_dns_ns_record": resourceArmDnsNsRecord(), - "azurerm_dns_ptr_record": resourceArmDnsPtrRecord(), - "azurerm_dns_srv_record": resourceArmDnsSrvRecord(), - "azurerm_dns_txt_record": resourceArmDnsTxtRecord(), - "azurerm_dns_zone": resourceArmDnsZone(), - "azurerm_eventgrid_topic": resourceArmEventGridTopic(), - "azurerm_eventhub": resourceArmEventHub(), - "azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(), - "azurerm_eventhub_consumer_group": resourceArmEventHubConsumerGroup(), - "azurerm_eventhub_namespace": resourceArmEventHubNamespace(), - "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), - "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), - "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), - "azurerm_function_app": resourceArmFunctionApp(), - "azurerm_image": resourceArmImage(), - "azurerm_iothub": resourceArmIotHub(), - "azurerm_key_vault": resourceArmKeyVault(), - "azurerm_key_vault_access_policy": resourceArmKeyVaultAccessPolicy(), - "azurerm_key_vault_certificate": resourceArmKeyVaultCertificate(), - "azurerm_key_vault_key": resourceArmKeyVaultKey(), - "azurerm_key_vault_secret": resourceArmKeyVaultSecret(), - "azurerm_kubernetes_cluster": resourceArmKubernetesCluster(), - "azurerm_lb": resourceArmLoadBalancer(), - "azurerm_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(), - "azurerm_lb_nat_rule": resourceArmLoadBalancerNatRule(), - "azurerm_lb_nat_pool": resourceArmLoadBalancerNatPool(), - "azurerm_lb_probe": resourceArmLoadBalancerProbe(), - "azurerm_lb_rule": resourceArmLoadBalancerRule(), - "azurerm_local_network_gateway": resourceArmLocalNetworkGateway(), - "azurerm_log_analytics_solution": resourceArmLogAnalyticsSolution(), - "azurerm_log_analytics_workspace": resourceArmLogAnalyticsWorkspace(), - "azurerm_managed_disk": resourceArmManagedDisk(), - "azurerm_management_lock": resourceArmManagementLock(), - "azurerm_metric_alertrule": resourceArmMetricAlertRule(), - "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), - "azurerm_mysql_database": resourceArmMySqlDatabase(), - "azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(), - "azurerm_mysql_server": resourceArmMySqlServer(), - "azurerm_network_interface": resourceArmNetworkInterface(), - "azurerm_network_security_group": resourceArmNetworkSecurityGroup(), - "azurerm_network_security_rule": resourceArmNetworkSecurityRule(), - "azurerm_network_watcher": resourceArmNetworkWatcher(), - "azurerm_packet_capture": resourceArmPacketCapture(), - "azurerm_policy_assignment": resourceArmPolicyAssignment(), - "azurerm_policy_definition": resourceArmPolicyDefinition(), - "azurerm_postgresql_configuration": resourceArmPostgreSQLConfiguration(), - "azurerm_postgresql_database": resourceArmPostgreSQLDatabase(), - "azurerm_postgresql_firewall_rule": resourceArmPostgreSQLFirewallRule(), - "azurerm_postgresql_server": resourceArmPostgreSQLServer(), - "azurerm_public_ip": resourceArmPublicIp(), - "azurerm_relay_namespace": resourceArmRelayNamespace(), - "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), - "azurerm_redis_cache": resourceArmRedisCache(), - "azurerm_redis_firewall_rule": resourceArmRedisFirewallRule(), - "azurerm_resource_group": resourceArmResourceGroup(), - "azurerm_role_assignment": resourceArmRoleAssignment(), - "azurerm_role_definition": resourceArmRoleDefinition(), - "azurerm_route": resourceArmRoute(), - "azurerm_route_table": resourceArmRouteTable(), - "azurerm_search_service": resourceArmSearchService(), - "azurerm_servicebus_namespace": resourceArmServiceBusNamespace(), - "azurerm_servicebus_namespace_authorization_rule": resourceArmServiceBusNamespaceAuthorizationRule(), - "azurerm_servicebus_queue": resourceArmServiceBusQueue(), - "azurerm_servicebus_subscription": resourceArmServiceBusSubscription(), - "azurerm_servicebus_subscription_rule": resourceArmServiceBusSubscriptionRule(), - "azurerm_servicebus_topic": resourceArmServiceBusTopic(), - "azurerm_servicebus_topic_authorization_rule": resourceArmServiceBusTopicAuthorizationRule(), - "azurerm_snapshot": resourceArmSnapshot(), - "azurerm_scheduler_job": resourceArmSchedulerJob(), - "azurerm_scheduler_job_collection": resourceArmSchedulerJobCollection(), - "azurerm_sql_database": resourceArmSqlDatabase(), - "azurerm_sql_elasticpool": resourceArmSqlElasticPool(), - "azurerm_sql_firewall_rule": resourceArmSqlFirewallRule(), - "azurerm_sql_active_directory_administrator": resourceArmSqlAdministrator(), - "azurerm_sql_server": resourceArmSqlServer(), - "azurerm_sql_virtual_network_rule": resourceArmSqlVirtualNetworkRule(), - "azurerm_storage_account": resourceArmStorageAccount(), - "azurerm_storage_blob": resourceArmStorageBlob(), - "azurerm_storage_container": resourceArmStorageContainer(), - "azurerm_storage_share": resourceArmStorageShare(), - "azurerm_storage_queue": resourceArmStorageQueue(), - "azurerm_storage_table": resourceArmStorageTable(), - "azurerm_subnet": resourceArmSubnet(), - "azurerm_template_deployment": resourceArmTemplateDeployment(), - "azurerm_traffic_manager_endpoint": resourceArmTrafficManagerEndpoint(), - "azurerm_traffic_manager_profile": resourceArmTrafficManagerProfile(), - "azurerm_user_assigned_identity": resourceArmUserAssignedIdentity(), - "azurerm_virtual_machine": resourceArmVirtualMachine(), - "azurerm_virtual_machine_data_disk_attachment": resourceArmVirtualMachineDataDiskAttachment(), - "azurerm_virtual_machine_extension": resourceArmVirtualMachineExtensions(), - "azurerm_virtual_machine_scale_set": resourceArmVirtualMachineScaleSet(), - "azurerm_virtual_network": resourceArmVirtualNetwork(), - "azurerm_virtual_network_gateway": resourceArmVirtualNetworkGateway(), - "azurerm_virtual_network_gateway_connection": resourceArmVirtualNetworkGatewayConnection(), - "azurerm_virtual_network_peering": resourceArmVirtualNetworkPeering(), - }, - } - - p.ConfigureFunc = providerConfigure(p) - - return p -} - -func providerConfigure(p *schema.Provider) schema.ConfigureFunc { - return func(d *schema.ResourceData) (interface{}, error) { - config := &authentication.Config{ - SubscriptionID: d.Get("subscription_id").(string), - ClientID: d.Get("client_id").(string), - ClientSecret: d.Get("client_secret").(string), - TenantID: d.Get("tenant_id").(string), - Environment: d.Get("environment").(string), - UseMsi: d.Get("use_msi").(bool), - MsiEndpoint: d.Get("msi_endpoint").(string), - SkipCredentialsValidation: d.Get("skip_credentials_validation").(bool), - SkipProviderRegistration: d.Get("skip_provider_registration").(bool), - } - - if config.UseMsi { - log.Printf("[DEBUG] use_msi specified - using MSI Authentication") - if config.MsiEndpoint == "" { - msiEndpoint, err := adal.GetMSIVMEndpoint() - if err != nil { - return nil, fmt.Errorf("Could not retrieve MSI endpoint from VM settings."+ - "Ensure the VM has MSI enabled, or try setting msi_endpoint. Error: %s", err) - } - config.MsiEndpoint = msiEndpoint - } - log.Printf("[DEBUG] Using MSI endpoint %s", config.MsiEndpoint) - if err := config.ValidateMsi(); err != nil { - return nil, err - } - } else if config.ClientSecret != "" { - log.Printf("[DEBUG] Client Secret specified - using Service Principal for Authentication") - if err := config.ValidateServicePrincipal(); err != nil { - return nil, err - } - } else { - log.Printf("[DEBUG] No Client Secret specified - loading credentials from Azure CLI") - if err := config.LoadTokensFromAzureCLI(); err != nil { - return nil, err - } - - if err := config.ValidateBearerAuth(); err != nil { - return nil, fmt.Errorf("Please specify either a Service Principal, or log in with the Azure CLI (using `az login`)") - } - } - - client, err := getArmClient(config) - if err != nil { - return nil, err - } - - client.StopContext = p.StopContext() - - // replaces the context between tests - p.MetaReset = func() error { - client.StopContext = p.StopContext() - return nil - } - - if !config.SkipCredentialsValidation { - // List all the available providers and their registration state to avoid unnecessary - // requests. This also lets us check if the provider credentials are correct. - ctx := client.StopContext - providerList, err := client.providersClient.List(ctx, nil, "") - if err != nil { - return nil, fmt.Errorf("Unable to list provider registration status, it is possible that this is due to invalid "+ - "credentials or the service principal does not have permission to use the Resource Manager API, Azure "+ - "error: %s", err) - } - - if !config.SkipProviderRegistration { - err = registerAzureResourceProvidersWithSubscription(ctx, providerList.Values(), client.providersClient) - if err != nil { - return nil, err - } - } - } - - return client, nil - } -} - -func registerProviderWithSubscription(ctx context.Context, providerName string, client resources.ProvidersClient) error { - _, err := client.Register(ctx, providerName) - if err != nil { - return fmt.Errorf("Cannot register provider %s with Azure Resource Manager: %s.", providerName, err) - } - - return nil -} - -func determineAzureResourceProvidersToRegister(providerList []resources.Provider) map[string]struct{} { - providers := map[string]struct{}{ - "Microsoft.Authorization": {}, - "Microsoft.Automation": {}, - "Microsoft.Cache": {}, - "Microsoft.Cdn": {}, - "Microsoft.Compute": {}, - "Microsoft.ContainerInstance": {}, - "Microsoft.ContainerRegistry": {}, - "Microsoft.ContainerService": {}, - "Microsoft.DataLakeStore": {}, - "Microsoft.DBforMySQL": {}, - "Microsoft.DBforPostgreSQL": {}, - "Microsoft.Devices": {}, - "Microsoft.DocumentDB": {}, - "Microsoft.EventGrid": {}, - "Microsoft.EventHub": {}, - "Microsoft.KeyVault": {}, - "microsoft.insights": {}, - "Microsoft.ManagedIdentity": {}, - "Microsoft.Network": {}, - "Microsoft.OperationalInsights": {}, - "Microsoft.Relay": {}, - "Microsoft.Resources": {}, - "Microsoft.Search": {}, - "Microsoft.ServiceBus": {}, - "Microsoft.Sql": {}, - "Microsoft.Storage": {}, - } - - // filter out any providers already registered - for _, p := range providerList { - if _, ok := providers[*p.Namespace]; !ok { - continue - } - - if strings.ToLower(*p.RegistrationState) == "registered" { - log.Printf("[DEBUG] Skipping provider registration for namespace %s\n", *p.Namespace) - delete(providers, *p.Namespace) - } - } - - return providers -} - -// registerAzureResourceProvidersWithSubscription uses the providers client to register -// all Azure resource providers which the Terraform provider may require (regardless of -// whether they are actually used by the configuration or not). It was confirmed by Microsoft -// that this is the approach their own internal tools also take. -func registerAzureResourceProvidersWithSubscription(ctx context.Context, providerList []resources.Provider, client resources.ProvidersClient) error { - providers := determineAzureResourceProvidersToRegister(providerList) - - var err error - var wg sync.WaitGroup - wg.Add(len(providers)) - - for providerName := range providers { - go func(p string) { - defer wg.Done() - log.Printf("[DEBUG] Registering provider with namespace %s\n", p) - if innerErr := registerProviderWithSubscription(ctx, p, client); err != nil { - err = innerErr - } - }(providerName) - } - - wg.Wait() - - return err -} - -// armMutexKV is the instance of MutexKV for ARM resources -var armMutexKV = mutexkv.NewMutexKV() - -// Deprecated - use `azschema.IgnoreCaseDiffSuppressFunc` instead -func ignoreCaseDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool { - return azSchema.IgnoreCaseDiffSuppressFunc(k, old, new, d) -} - -// ignoreCaseStateFunc is a StateFunc from helper/schema that converts the -// supplied value to lower before saving to state for consistency. -func ignoreCaseStateFunc(val interface{}) string { - return strings.ToLower(val.(string)) -} - -func userDataDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool { - oldValue := userDataStateFunc(old) - return oldValue == new -} - -func userDataStateFunc(v interface{}) string { - switch s := v.(type) { - case string: - s = base64Encode(s) - hash := sha1.Sum([]byte(s)) - return hex.EncodeToString(hash[:]) - default: - return "" - } -} - -// base64Encode encodes data if the input isn't already encoded using -// base64.StdEncoding.EncodeToString. If the input is already base64 encoded, -// return the original input unchanged. -func base64Encode(data string) string { - // Check whether the data is already Base64 encoded; don't double-encode - if isBase64Encoded(data) { - return data - } - // data has not been encoded encode and return - return base64.StdEncoding.EncodeToString([]byte(data)) -} - -func isBase64Encoded(data string) bool { - _, err := base64.StdEncoding.DecodeString(data) - return err == nil -} +package azurerm + +import ( + "context" + "crypto/sha1" + "encoding/base64" + "encoding/hex" + "fmt" + "log" + "strings" + "sync" + + "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources" + "github.com/Azure/go-autorest/autorest/adal" + "github.com/hashicorp/terraform/helper/mutexkv" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/authentication" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/schema" +) + +// Provider returns a terraform.ResourceProvider. +func Provider() terraform.ResourceProvider { + var p *schema.Provider + p = &schema.Provider{ + Schema: map[string]*schema.Schema{ + "subscription_id": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_SUBSCRIPTION_ID", ""), + }, + + "client_id": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_CLIENT_ID", ""), + }, + + "client_secret": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_CLIENT_SECRET", ""), + }, + + "tenant_id": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_TENANT_ID", ""), + }, + + "environment": { + Type: schema.TypeString, + Required: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_ENVIRONMENT", "public"), + }, + + "skip_credentials_validation": { + Type: schema.TypeBool, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_SKIP_CREDENTIALS_VALIDATION", false), + }, + + "skip_provider_registration": { + Type: schema.TypeBool, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_SKIP_PROVIDER_REGISTRATION", false), + }, + "use_msi": { + Type: schema.TypeBool, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_USE_MSI", false), + }, + "msi_endpoint": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("ARM_MSI_ENDPOINT", ""), + }, + }, + + DataSourcesMap: map[string]*schema.Resource{ + "azurerm_application_security_group": dataSourceArmApplicationSecurityGroup(), + "azurerm_app_service": dataSourceArmAppService(), + "azurerm_app_service_plan": dataSourceAppServicePlan(), + "azurerm_builtin_role_definition": dataSourceArmBuiltInRoleDefinition(), + "azurerm_cdn_profile": dataSourceArmCdnProfile(), + "azurerm_client_config": dataSourceArmClientConfig(), + "azurerm_cosmosdb_account": dataSourceArmCosmosDBAccount(), + "azurerm_data_lake_store": dataSourceArmDataLakeStoreAccount(), + "azurerm_dns_zone": dataSourceArmDnsZone(), + "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), + "azurerm_image": dataSourceArmImage(), + "azurerm_key_vault": dataSourceArmKeyVault(), + "azurerm_key_vault_access_policy": dataSourceArmKeyVaultAccessPolicy(), + "azurerm_key_vault_secret": dataSourceArmKeyVaultSecret(), + "azurerm_kubernetes_cluster": dataSourceArmKubernetesCluster(), + "azurerm_managed_disk": dataSourceArmManagedDisk(), + "azurerm_network_interface": dataSourceArmNetworkInterface(), + "azurerm_network_security_group": dataSourceArmNetworkSecurityGroup(), + "azurerm_platform_image": dataSourceArmPlatformImage(), + "azurerm_public_ip": dataSourceArmPublicIP(), + "azurerm_public_ips": dataSourceArmPublicIPs(), + "azurerm_recovery_services_vault": dataSourceArmRecoveryServicesVault(), + "azurerm_resource_group": dataSourceArmResourceGroup(), + "azurerm_role_definition": dataSourceArmRoleDefinition(), + "azurerm_route_table": dataSourceArmRouteTable(), + "azurerm_scheduler_job_collection": dataSourceArmSchedulerJobCollection(), + "azurerm_snapshot": dataSourceArmSnapshot(), + "azurerm_storage_account": dataSourceArmStorageAccount(), + "azurerm_storage_account_sas": dataSourceArmStorageAccountSharedAccessSignature(), + "azurerm_subnet": dataSourceArmSubnet(), + "azurerm_subscription": dataSourceArmSubscription(), + "azurerm_subscriptions": dataSourceArmSubscriptions(), + "azurerm_traffic_manager_geographical_location": dataSourceArmTrafficManagerGeographicalLocation(), + "azurerm_virtual_network": dataSourceArmVirtualNetwork(), + "azurerm_virtual_network_gateway": dataSourceArmVirtualNetworkGateway(), + }, + + ResourcesMap: map[string]*schema.Resource{ + "azurerm_action_group": resourceArmActionGroup(), + "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), + "azurerm_application_gateway": resourceArmApplicationGateway(), + "azurerm_application_insights": resourceArmApplicationInsights(), + "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), + "azurerm_app_service": resourceArmAppService(), + "azurerm_app_service_plan": resourceArmAppServicePlan(), + "azurerm_app_service_active_slot": resourceArmAppServiceActiveSlot(), + "azurerm_app_service_custom_hostname_binding": resourceArmAppServiceCustomHostnameBinding(), + "azurerm_app_service_slot": resourceArmAppServiceSlot(), + "azurerm_automation_account": resourceArmAutomationAccount(), + "azurerm_automation_credential": resourceArmAutomationCredential(), + "azurerm_automation_runbook": resourceArmAutomationRunbook(), + "azurerm_automation_schedule": resourceArmAutomationSchedule(), + "azurerm_availability_set": resourceArmAvailabilitySet(), + "azurerm_cdn_endpoint": resourceArmCdnEndpoint(), + "azurerm_cdn_profile": resourceArmCdnProfile(), + "azurerm_container_registry": resourceArmContainerRegistry(), + "azurerm_container_service": resourceArmContainerService(), + "azurerm_container_group": resourceArmContainerGroup(), + "azurerm_cosmosdb_account": resourceArmCosmosDBAccount(), + "azurerm_data_lake_store": resourceArmDataLakeStore(), + "azurerm_data_lake_store_firewall_rule": resourceArmDataLakeStoreFirewallRule(), + "azurerm_dns_a_record": resourceArmDnsARecord(), + "azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(), + "azurerm_dns_caa_record": resourceArmDnsCaaRecord(), + "azurerm_dns_cname_record": resourceArmDnsCNameRecord(), + "azurerm_dns_mx_record": resourceArmDnsMxRecord(), + "azurerm_dns_ns_record": resourceArmDnsNsRecord(), + "azurerm_dns_ptr_record": resourceArmDnsPtrRecord(), + "azurerm_dns_srv_record": resourceArmDnsSrvRecord(), + "azurerm_dns_txt_record": resourceArmDnsTxtRecord(), + "azurerm_dns_zone": resourceArmDnsZone(), + "azurerm_eventgrid_topic": resourceArmEventGridTopic(), + "azurerm_eventhub": resourceArmEventHub(), + "azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(), + "azurerm_eventhub_consumer_group": resourceArmEventHubConsumerGroup(), + "azurerm_eventhub_namespace": resourceArmEventHubNamespace(), + "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), + "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), + "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), + "azurerm_function_app": resourceArmFunctionApp(), + "azurerm_image": resourceArmImage(), + "azurerm_iothub": resourceArmIotHub(), + "azurerm_key_vault": resourceArmKeyVault(), + "azurerm_key_vault_access_policy": resourceArmKeyVaultAccessPolicy(), + "azurerm_key_vault_certificate": resourceArmKeyVaultCertificate(), + "azurerm_key_vault_key": resourceArmKeyVaultKey(), + "azurerm_key_vault_secret": resourceArmKeyVaultSecret(), + "azurerm_kubernetes_cluster": resourceArmKubernetesCluster(), + "azurerm_lb": resourceArmLoadBalancer(), + "azurerm_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(), + "azurerm_lb_nat_rule": resourceArmLoadBalancerNatRule(), + "azurerm_lb_nat_pool": resourceArmLoadBalancerNatPool(), + "azurerm_lb_probe": resourceArmLoadBalancerProbe(), + "azurerm_lb_rule": resourceArmLoadBalancerRule(), + "azurerm_local_network_gateway": resourceArmLocalNetworkGateway(), + "azurerm_log_analytics_solution": resourceArmLogAnalyticsSolution(), + "azurerm_log_analytics_workspace": resourceArmLogAnalyticsWorkspace(), + "azurerm_managed_disk": resourceArmManagedDisk(), + "azurerm_management_lock": resourceArmManagementLock(), + "azurerm_metric_alertrule": resourceArmMetricAlertRule(), + "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), + "azurerm_mysql_database": resourceArmMySqlDatabase(), + "azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(), + "azurerm_mysql_server": resourceArmMySqlServer(), + "azurerm_network_interface": resourceArmNetworkInterface(), + "azurerm_network_security_group": resourceArmNetworkSecurityGroup(), + "azurerm_network_security_rule": resourceArmNetworkSecurityRule(), + "azurerm_network_watcher": resourceArmNetworkWatcher(), + "azurerm_packet_capture": resourceArmPacketCapture(), + "azurerm_policy_assignment": resourceArmPolicyAssignment(), + "azurerm_policy_definition": resourceArmPolicyDefinition(), + "azurerm_postgresql_configuration": resourceArmPostgreSQLConfiguration(), + "azurerm_postgresql_database": resourceArmPostgreSQLDatabase(), + "azurerm_postgresql_firewall_rule": resourceArmPostgreSQLFirewallRule(), + "azurerm_postgresql_server": resourceArmPostgreSQLServer(), + "azurerm_public_ip": resourceArmPublicIp(), + "azurerm_relay_namespace": resourceArmRelayNamespace(), + "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), + "azurerm_redis_cache": resourceArmRedisCache(), + "azurerm_redis_firewall_rule": resourceArmRedisFirewallRule(), + "azurerm_resource_group": resourceArmResourceGroup(), + "azurerm_role_assignment": resourceArmRoleAssignment(), + "azurerm_role_definition": resourceArmRoleDefinition(), + "azurerm_route": resourceArmRoute(), + "azurerm_route_table": resourceArmRouteTable(), + "azurerm_search_service": resourceArmSearchService(), + "azurerm_servicebus_namespace": resourceArmServiceBusNamespace(), + "azurerm_servicebus_namespace_authorization_rule": resourceArmServiceBusNamespaceAuthorizationRule(), + "azurerm_servicebus_queue": resourceArmServiceBusQueue(), + "azurerm_servicebus_subscription": resourceArmServiceBusSubscription(), + "azurerm_servicebus_subscription_rule": resourceArmServiceBusSubscriptionRule(), + "azurerm_servicebus_topic": resourceArmServiceBusTopic(), + "azurerm_servicebus_topic_authorization_rule": resourceArmServiceBusTopicAuthorizationRule(), + "azurerm_snapshot": resourceArmSnapshot(), + "azurerm_scheduler_job": resourceArmSchedulerJob(), + "azurerm_scheduler_job_collection": resourceArmSchedulerJobCollection(), + "azurerm_sql_database": resourceArmSqlDatabase(), + "azurerm_sql_elasticpool": resourceArmSqlElasticPool(), + "azurerm_sql_firewall_rule": resourceArmSqlFirewallRule(), + "azurerm_sql_active_directory_administrator": resourceArmSqlAdministrator(), + "azurerm_sql_server": resourceArmSqlServer(), + "azurerm_sql_virtual_network_rule": resourceArmSqlVirtualNetworkRule(), + "azurerm_storage_account": resourceArmStorageAccount(), + "azurerm_storage_blob": resourceArmStorageBlob(), + "azurerm_storage_container": resourceArmStorageContainer(), + "azurerm_storage_share": resourceArmStorageShare(), + "azurerm_storage_queue": resourceArmStorageQueue(), + "azurerm_storage_table": resourceArmStorageTable(), + "azurerm_subnet": resourceArmSubnet(), + "azurerm_template_deployment": resourceArmTemplateDeployment(), + "azurerm_traffic_manager_endpoint": resourceArmTrafficManagerEndpoint(), + "azurerm_traffic_manager_profile": resourceArmTrafficManagerProfile(), + "azurerm_user_assigned_identity": resourceArmUserAssignedIdentity(), + "azurerm_virtual_machine": resourceArmVirtualMachine(), + "azurerm_virtual_machine_data_disk_attachment": resourceArmVirtualMachineDataDiskAttachment(), + "azurerm_virtual_machine_extension": resourceArmVirtualMachineExtensions(), + "azurerm_virtual_machine_scale_set": resourceArmVirtualMachineScaleSet(), + "azurerm_virtual_network": resourceArmVirtualNetwork(), + "azurerm_virtual_network_gateway": resourceArmVirtualNetworkGateway(), + "azurerm_virtual_network_gateway_connection": resourceArmVirtualNetworkGatewayConnection(), + "azurerm_virtual_network_peering": resourceArmVirtualNetworkPeering(), + }, + } + + p.ConfigureFunc = providerConfigure(p) + + return p +} + +func providerConfigure(p *schema.Provider) schema.ConfigureFunc { + return func(d *schema.ResourceData) (interface{}, error) { + config := &authentication.Config{ + SubscriptionID: d.Get("subscription_id").(string), + ClientID: d.Get("client_id").(string), + ClientSecret: d.Get("client_secret").(string), + TenantID: d.Get("tenant_id").(string), + Environment: d.Get("environment").(string), + UseMsi: d.Get("use_msi").(bool), + MsiEndpoint: d.Get("msi_endpoint").(string), + SkipCredentialsValidation: d.Get("skip_credentials_validation").(bool), + SkipProviderRegistration: d.Get("skip_provider_registration").(bool), + } + + if config.UseMsi { + log.Printf("[DEBUG] use_msi specified - using MSI Authentication") + if config.MsiEndpoint == "" { + msiEndpoint, err := adal.GetMSIVMEndpoint() + if err != nil { + return nil, fmt.Errorf("Could not retrieve MSI endpoint from VM settings."+ + "Ensure the VM has MSI enabled, or try setting msi_endpoint. Error: %s", err) + } + config.MsiEndpoint = msiEndpoint + } + log.Printf("[DEBUG] Using MSI endpoint %s", config.MsiEndpoint) + if err := config.ValidateMsi(); err != nil { + return nil, err + } + } else if config.ClientSecret != "" { + log.Printf("[DEBUG] Client Secret specified - using Service Principal for Authentication") + if err := config.ValidateServicePrincipal(); err != nil { + return nil, err + } + } else { + log.Printf("[DEBUG] No Client Secret specified - loading credentials from Azure CLI") + if err := config.LoadTokensFromAzureCLI(); err != nil { + return nil, err + } + + if err := config.ValidateBearerAuth(); err != nil { + return nil, fmt.Errorf("Please specify either a Service Principal, or log in with the Azure CLI (using `az login`)") + } + } + + client, err := getArmClient(config) + if err != nil { + return nil, err + } + + client.StopContext = p.StopContext() + + // replaces the context between tests + p.MetaReset = func() error { + client.StopContext = p.StopContext() + return nil + } + + if !config.SkipCredentialsValidation { + // List all the available providers and their registration state to avoid unnecessary + // requests. This also lets us check if the provider credentials are correct. + ctx := client.StopContext + providerList, err := client.providersClient.List(ctx, nil, "") + if err != nil { + return nil, fmt.Errorf("Unable to list provider registration status, it is possible that this is due to invalid "+ + "credentials or the service principal does not have permission to use the Resource Manager API, Azure "+ + "error: %s", err) + } + + if !config.SkipProviderRegistration { + err = registerAzureResourceProvidersWithSubscription(ctx, providerList.Values(), client.providersClient) + if err != nil { + return nil, err + } + } + } + + return client, nil + } +} + +func registerProviderWithSubscription(ctx context.Context, providerName string, client resources.ProvidersClient) error { + _, err := client.Register(ctx, providerName) + if err != nil { + return fmt.Errorf("Cannot register provider %s with Azure Resource Manager: %s.", providerName, err) + } + + return nil +} + +func determineAzureResourceProvidersToRegister(providerList []resources.Provider) map[string]struct{} { + providers := map[string]struct{}{ + "Microsoft.Authorization": {}, + "Microsoft.Automation": {}, + "Microsoft.Cache": {}, + "Microsoft.Cdn": {}, + "Microsoft.Compute": {}, + "Microsoft.ContainerInstance": {}, + "Microsoft.ContainerRegistry": {}, + "Microsoft.ContainerService": {}, + "Microsoft.DataLakeStore": {}, + "Microsoft.DBforMySQL": {}, + "Microsoft.DBforPostgreSQL": {}, + "Microsoft.Devices": {}, + "Microsoft.DocumentDB": {}, + "Microsoft.EventGrid": {}, + "Microsoft.EventHub": {}, + "Microsoft.KeyVault": {}, + "microsoft.insights": {}, + "Microsoft.ManagedIdentity": {}, + "Microsoft.Network": {}, + "Microsoft.OperationalInsights": {}, + "Microsoft.Relay": {}, + "Microsoft.Resources": {}, + "Microsoft.Search": {}, + "Microsoft.ServiceBus": {}, + "Microsoft.Sql": {}, + "Microsoft.Storage": {}, + } + + // filter out any providers already registered + for _, p := range providerList { + if _, ok := providers[*p.Namespace]; !ok { + continue + } + + if strings.ToLower(*p.RegistrationState) == "registered" { + log.Printf("[DEBUG] Skipping provider registration for namespace %s\n", *p.Namespace) + delete(providers, *p.Namespace) + } + } + + return providers +} + +// registerAzureResourceProvidersWithSubscription uses the providers client to register +// all Azure resource providers which the Terraform provider may require (regardless of +// whether they are actually used by the configuration or not). It was confirmed by Microsoft +// that this is the approach their own internal tools also take. +func registerAzureResourceProvidersWithSubscription(ctx context.Context, providerList []resources.Provider, client resources.ProvidersClient) error { + providers := determineAzureResourceProvidersToRegister(providerList) + + var err error + var wg sync.WaitGroup + wg.Add(len(providers)) + + for providerName := range providers { + go func(p string) { + defer wg.Done() + log.Printf("[DEBUG] Registering provider with namespace %s\n", p) + if innerErr := registerProviderWithSubscription(ctx, p, client); err != nil { + err = innerErr + } + }(providerName) + } + + wg.Wait() + + return err +} + +// armMutexKV is the instance of MutexKV for ARM resources +var armMutexKV = mutexkv.NewMutexKV() + +// Deprecated - use `azschema.IgnoreCaseDiffSuppressFunc` instead +func ignoreCaseDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool { + return azSchema.IgnoreCaseDiffSuppressFunc(k, old, new, d) +} + +// ignoreCaseStateFunc is a StateFunc from helper/schema that converts the +// supplied value to lower before saving to state for consistency. +func ignoreCaseStateFunc(val interface{}) string { + return strings.ToLower(val.(string)) +} + +func userDataDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool { + oldValue := userDataStateFunc(old) + return oldValue == new +} + +func userDataStateFunc(v interface{}) string { + switch s := v.(type) { + case string: + s = base64Encode(s) + hash := sha1.Sum([]byte(s)) + return hex.EncodeToString(hash[:]) + default: + return "" + } +} + +// base64Encode encodes data if the input isn't already encoded using +// base64.StdEncoding.EncodeToString. If the input is already base64 encoded, +// return the original input unchanged. +func base64Encode(data string) string { + // Check whether the data is already Base64 encoded; don't double-encode + if isBase64Encoded(data) { + return data + } + // data has not been encoded encode and return + return base64.StdEncoding.EncodeToString([]byte(data)) +} + +func isBase64Encoded(data string) bool { + _, err := base64.StdEncoding.DecodeString(data) + return err == nil +} From 589eb7ed5fdd5ae6772402090e7c0dfabd8f741f Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Mon, 16 Jul 2018 16:56:49 -0700 Subject: [PATCH 08/15] Modify the code according to the feedbacks --- azurerm/import_arm_action_group_test.go | 77 ----------- azurerm/resource_arm_action_group.go | 155 +++++++++++----------- azurerm/resource_arm_action_group_test.go | 69 ++++++++++ 3 files changed, 143 insertions(+), 158 deletions(-) delete mode 100644 azurerm/import_arm_action_group_test.go diff --git a/azurerm/import_arm_action_group_test.go b/azurerm/import_arm_action_group_test.go deleted file mode 100644 index 45422a283ace..000000000000 --- a/azurerm/import_arm_action_group_test.go +++ /dev/null @@ -1,77 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMActionGroup_importBasic(t *testing.T) { - resourceName := "azurerm_action_group.test" - - ri := acctest.RandInt() - config := testAccAzureRMActionGroup_basic(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMActionGroup_importEmpty(t *testing.T) { - resourceName := "azurerm_action_group.test" - - ri := acctest.RandInt() - config := testAccAzureRMActionGroup_empty(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMActionGroup_importDisabledEmpty(t *testing.T) { - resourceName := "azurerm_action_group.test" - - ri := acctest.RandInt() - config := testAccAzureRMActionGroup_disabledEmpty(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/azurerm/resource_arm_action_group.go b/azurerm/resource_arm_action_group.go index bc7c0b1b74e6..b9e305cadf2f 100644 --- a/azurerm/resource_arm_action_group.go +++ b/azurerm/resource_arm_action_group.go @@ -5,6 +5,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/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" ) @@ -21,17 +22,20 @@ func resourceArmActionGroup() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.NoZeroValues, }, - "location": locationSchema(), + "location": locationSchema(), + "resource_group_name": resourceGroupNameSchema(), "short_name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, "enabled": { @@ -46,12 +50,14 @@ func resourceArmActionGroup() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, "email_address": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, }, }, @@ -63,16 +69,19 @@ func resourceArmActionGroup() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, "country_code": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, "phone_number": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, }, }, @@ -84,12 +93,14 @@ func resourceArmActionGroup() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, "service_uri": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, }, }, }, @@ -115,17 +126,26 @@ func resourceArmActionGroupCreateOrUpdate(d *schema.ResourceData, meta interface expandedTags := expandTags(tags) parameters := insights.ActionGroupResource{ - Location: utils.String(location), + Location: &location, ActionGroup: &insights.ActionGroup{ - GroupShortName: utils.String(shortName), - Enabled: utils.Bool(enabled), - EmailReceivers: expandActionGroupEmailReceiver(d), - SmsReceivers: expandActionGroupSmsReceiver(d), - WebhookReceivers: expandActionGroupWebHookReceiver(d), + GroupShortName: &shortName, + Enabled: &enabled, }, Tags: expandedTags, } + if v, ok := d.GetOk("email_receiver"); ok { + parameters.ActionGroup.EmailReceivers = expandActionGroupEmailReceiver(v.([]interface{})) + } + + if v, ok := d.GetOk("sms_receiver"); ok { + parameters.ActionGroup.SmsReceivers = expandActionGroupSmsReceiver(v.([]interface{})) + } + + if v, ok := d.GetOk("webhook_receiver"); ok { + parameters.ActionGroup.WebhookReceivers = expandActionGroupWebHookReceiver(v.([]interface{})) + } + _, err := client.CreateOrUpdate(ctx, resGroup, name, parameters) if err != nil { return fmt.Errorf("Error creating or updating action group %s (resource group %s): %+v", name, resGroup, err) @@ -212,96 +232,71 @@ func resourceArmActionGroupDelete(d *schema.ResourceData, meta interface{}) erro return nil } -func expandActionGroupEmailReceiver(d *schema.ResourceData) *[]insights.EmailReceiver { - v, ok := d.GetOk("email_receiver") - if !ok { - return nil - } - +func expandActionGroupEmailReceiver(v []interface{}) *[]insights.EmailReceiver { receivers := make([]insights.EmailReceiver, 0) - for _, receiverValue := range v.([]interface{}) { + 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 flattenActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) []interface{} { - result := make([]interface{}, 0) - if receivers != nil { - for _, receiver := range *receivers { - val := make(map[string]interface{}, 0) - - val["name"] = *receiver.Name - val["email_address"] = *receiver.EmailAddress - - result = append(result, val) - } - } - return result -} - -func expandActionGroupSmsReceiver(d *schema.ResourceData) *[]insights.SmsReceiver { - v, ok := d.GetOk("sms_receiver") - if !ok { - return nil - } - +func expandActionGroupSmsReceiver(v []interface{}) *[]insights.SmsReceiver { receivers := make([]insights.SmsReceiver, 0) - for _, receiverValue := range v.([]interface{}) { + 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 expandActionGroupWebHookReceiver(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 flattenActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []interface{} { +func flattenActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) []interface{} { result := make([]interface{}, 0) if receivers != nil { for _, receiver := range *receivers { val := make(map[string]interface{}, 0) - val["name"] = *receiver.Name - val["country_code"] = *receiver.CountryCode - val["phone_number"] = *receiver.PhoneNumber - + val["email_address"] = *receiver.EmailAddress result = append(result, val) } } return result } -func expandActionGroupWebHookReceiver(d *schema.ResourceData) *[]insights.WebhookReceiver { - v, ok := d.GetOk("webhook_receiver") - if !ok { - return nil - } - - receivers := make([]insights.WebhookReceiver, 0) - for _, receiverValue := range v.([]interface{}) { - val := receiverValue.(map[string]interface{}) - - receiver := insights.WebhookReceiver{ - Name: utils.String(val["name"].(string)), - ServiceURI: utils.String(val["service_uri"].(string)), +func flattenActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []interface{} { + result := make([]interface{}, 0) + if receivers != nil { + for _, receiver := range *receivers { + val := make(map[string]interface{}, 0) + val["name"] = *receiver.Name + val["country_code"] = *receiver.CountryCode + val["phone_number"] = *receiver.PhoneNumber + result = append(result, val) } - - receivers = append(receivers, receiver) } - return &receivers + return result } func flattenActionGroupWebHookReceiver(receivers *[]insights.WebhookReceiver) []interface{} { @@ -309,10 +304,8 @@ func flattenActionGroupWebHookReceiver(receivers *[]insights.WebhookReceiver) [] if receivers != nil { for _, receiver := range *receivers { val := make(map[string]interface{}, 0) - val["name"] = *receiver.Name val["service_uri"] = *receiver.ServiceURI - result = append(result, val) } } diff --git a/azurerm/resource_arm_action_group_test.go b/azurerm/resource_arm_action_group_test.go index da86e90ac28d..e946d4e4f3b4 100644 --- a/azurerm/resource_arm_action_group_test.go +++ b/azurerm/resource_arm_action_group_test.go @@ -39,6 +39,29 @@ func TestAccAzureRMActionGroup_basic(t *testing.T) { }) } +func TestAccAzureRMActionGroup_importBasic(t *testing.T) { + resourceName := "azurerm_action_group.test" + + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_basic(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAzureRMActionGroup_empty(t *testing.T) { resourceName := "azurerm_action_group.test" ri := acctest.RandInt() @@ -63,6 +86,29 @@ func TestAccAzureRMActionGroup_empty(t *testing.T) { }) } +func TestAccAzureRMActionGroup_importEmpty(t *testing.T) { + resourceName := "azurerm_action_group.test" + + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_empty(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccAzureRMActionGroup_disabledEmpty(t *testing.T) { resourceName := "azurerm_action_group.test" ri := acctest.RandInt() @@ -100,6 +146,29 @@ func TestAccAzureRMActionGroup_disabledEmpty(t *testing.T) { }) } +func TestAccAzureRMActionGroup_importDisabledEmpty(t *testing.T) { + resourceName := "azurerm_action_group.test" + + ri := acctest.RandInt() + config := testAccAzureRMActionGroup_disabledEmpty(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccAzureRMActionGroup_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From e498d2d0d87dbc874a2ecfcaf935bf8912ef0986 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Sun, 29 Jul 2018 21:50:45 -0400 Subject: [PATCH 09/15] Upgrade to the latest Go SDK --- azurerm/resource_arm_action_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_action_group.go b/azurerm/resource_arm_action_group.go index b9e305cadf2f..7f208668cdee 100644 --- a/azurerm/resource_arm_action_group.go +++ b/azurerm/resource_arm_action_group.go @@ -3,7 +3,7 @@ package azurerm import ( "fmt" - "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights" + "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" From f26338be3b9340d9d3a56c7cb92901bdfd7677fc Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Sun, 29 Jul 2018 22:07:59 -0400 Subject: [PATCH 10/15] Include import test as one step after normal tests --- azurerm/resource_arm_action_group_test.go | 54 ----------------------- 1 file changed, 54 deletions(-) diff --git a/azurerm/resource_arm_action_group_test.go b/azurerm/resource_arm_action_group_test.go index e946d4e4f3b4..34d68022ed67 100644 --- a/azurerm/resource_arm_action_group_test.go +++ b/azurerm/resource_arm_action_group_test.go @@ -35,24 +35,6 @@ func TestAccAzureRMActionGroup_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "webhook_receiver.0.service_uri", "http://example.com/alert"), ), }, - }, - }) -} - -func TestAccAzureRMActionGroup_importBasic(t *testing.T) { - resourceName := "azurerm_action_group.test" - - ri := acctest.RandInt() - config := testAccAzureRMActionGroup_basic(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, { ResourceName: resourceName, ImportState: true, @@ -82,24 +64,6 @@ func TestAccAzureRMActionGroup_empty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), ), }, - }, - }) -} - -func TestAccAzureRMActionGroup_importEmpty(t *testing.T) { - resourceName := "azurerm_action_group.test" - - ri := acctest.RandInt() - config := testAccAzureRMActionGroup_empty(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, { ResourceName: resourceName, ImportState: true, @@ -142,24 +106,6 @@ func TestAccAzureRMActionGroup_disabledEmpty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "enabled", "false"), ), }, - }, - }) -} - -func TestAccAzureRMActionGroup_importDisabledEmpty(t *testing.T) { - resourceName := "azurerm_action_group.test" - - ri := acctest.RandInt() - config := testAccAzureRMActionGroup_disabledEmpty(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, { ResourceName: resourceName, ImportState: true, From 9514ac21eca4c5ce6f784891f4b9a2acfd272cf7 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Mon, 6 Aug 2018 17:16:53 -0700 Subject: [PATCH 11/15] Rename from action_group to monitor_action_group --- azurerm/provider.go | 2 +- ...o => resource_arm_monitor_action_group.go} | 42 +++++++-------- ...resource_arm_monitor_action_group_test.go} | 54 +++++++++---------- website/azurerm.erb | 4 +- ...own => monitor_action_group.html.markdown} | 12 ++--- 5 files changed, 57 insertions(+), 57 deletions(-) rename azurerm/{resource_arm_action_group.go => resource_arm_monitor_action_group.go} (81%) rename azurerm/{resource_arm_action_group_test.go => resource_arm_monitor_action_group_test.go} (76%) rename website/docs/r/{action_group.html.markdown => monitor_action_group.html.markdown} (87%) diff --git a/azurerm/provider.go b/azurerm/provider.go index 93016668eb70..94475d49c80e 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -122,7 +122,7 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ - "azurerm_action_group": resourceArmActionGroup(), + "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), "azurerm_azuread_service_principal": resourceArmActiveDirectoryServicePrincipal(), "azurerm_azuread_service_principal_password": resourceArmActiveDirectoryServicePrincipalPassword(), diff --git a/azurerm/resource_arm_action_group.go b/azurerm/resource_arm_monitor_action_group.go similarity index 81% rename from azurerm/resource_arm_action_group.go rename to azurerm/resource_arm_monitor_action_group.go index 7f208668cdee..1f9ddd4c3276 100644 --- a/azurerm/resource_arm_action_group.go +++ b/azurerm/resource_arm_monitor_action_group.go @@ -10,12 +10,12 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceArmActionGroup() *schema.Resource { +func resourceArmMonitorActionGroup() *schema.Resource { return &schema.Resource{ - Create: resourceArmActionGroupCreateOrUpdate, - Read: resourceArmActionGroupRead, - Update: resourceArmActionGroupCreateOrUpdate, - Delete: resourceArmActionGroupDelete, + Create: resourceArmMonitorActionGroupCreateOrUpdate, + Read: resourceArmMonitorActionGroupRead, + Update: resourceArmMonitorActionGroupCreateOrUpdate, + Delete: resourceArmMonitorActionGroupDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -111,7 +111,7 @@ func resourceArmActionGroup() *schema.Resource { } } -func resourceArmActionGroupCreateOrUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmMonitorActionGroupCreateOrUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).actionGroupsClient ctx := meta.(*ArmClient).StopContext @@ -135,15 +135,15 @@ func resourceArmActionGroupCreateOrUpdate(d *schema.ResourceData, meta interface } if v, ok := d.GetOk("email_receiver"); ok { - parameters.ActionGroup.EmailReceivers = expandActionGroupEmailReceiver(v.([]interface{})) + parameters.ActionGroup.EmailReceivers = expandMonitorActionGroupEmailReceiver(v.([]interface{})) } if v, ok := d.GetOk("sms_receiver"); ok { - parameters.ActionGroup.SmsReceivers = expandActionGroupSmsReceiver(v.([]interface{})) + parameters.ActionGroup.SmsReceivers = expandMonitorActionGroupSmsReceiver(v.([]interface{})) } if v, ok := d.GetOk("webhook_receiver"); ok { - parameters.ActionGroup.WebhookReceivers = expandActionGroupWebHookReceiver(v.([]interface{})) + parameters.ActionGroup.WebhookReceivers = expandMonitorActionGroupWebHookReceiver(v.([]interface{})) } _, err := client.CreateOrUpdate(ctx, resGroup, name, parameters) @@ -161,10 +161,10 @@ func resourceArmActionGroupCreateOrUpdate(d *schema.ResourceData, meta interface d.SetId(*read.ID) - return resourceArmActionGroupRead(d, meta) + return resourceArmMonitorActionGroupRead(d, meta) } -func resourceArmActionGroupRead(d *schema.ResourceData, meta interface{}) error { +func resourceArmMonitorActionGroupRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).actionGroupsClient ctx := meta.(*ArmClient).StopContext @@ -193,15 +193,15 @@ func resourceArmActionGroupRead(d *schema.ResourceData, meta interface{}) error d.Set("short_name", *resp.GroupShortName) d.Set("enabled", *resp.Enabled) - if err = d.Set("email_receiver", flattenActionGroupEmailReceiver(resp.EmailReceivers)); err != nil { + if err = d.Set("email_receiver", flattenMonitorActionGroupEmailReceiver(resp.EmailReceivers)); err != nil { return fmt.Errorf("Error setting `email_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) } - if err = d.Set("sms_receiver", flattenActionGroupSmsReceiver(resp.SmsReceivers)); err != nil { + if err = d.Set("sms_receiver", flattenMonitorActionGroupSmsReceiver(resp.SmsReceivers)); err != nil { return fmt.Errorf("Error setting `sms_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) } - if err = d.Set("webhook_receiver", flattenActionGroupWebHookReceiver(resp.WebhookReceivers)); err != nil { + if err = d.Set("webhook_receiver", flattenMonitorActionGroupWebHookReceiver(resp.WebhookReceivers)); err != nil { return fmt.Errorf("Error setting `webhook_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) } @@ -210,7 +210,7 @@ func resourceArmActionGroupRead(d *schema.ResourceData, meta interface{}) error return nil } -func resourceArmActionGroupDelete(d *schema.ResourceData, meta interface{}) error { +func resourceArmMonitorActionGroupDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).actionGroupsClient ctx := meta.(*ArmClient).StopContext @@ -232,7 +232,7 @@ func resourceArmActionGroupDelete(d *schema.ResourceData, meta interface{}) erro return nil } -func expandActionGroupEmailReceiver(v []interface{}) *[]insights.EmailReceiver { +func expandMonitorActionGroupEmailReceiver(v []interface{}) *[]insights.EmailReceiver { receivers := make([]insights.EmailReceiver, 0) for _, receiverValue := range v { val := receiverValue.(map[string]interface{}) @@ -245,7 +245,7 @@ func expandActionGroupEmailReceiver(v []interface{}) *[]insights.EmailReceiver { return &receivers } -func expandActionGroupSmsReceiver(v []interface{}) *[]insights.SmsReceiver { +func expandMonitorActionGroupSmsReceiver(v []interface{}) *[]insights.SmsReceiver { receivers := make([]insights.SmsReceiver, 0) for _, receiverValue := range v { val := receiverValue.(map[string]interface{}) @@ -259,7 +259,7 @@ func expandActionGroupSmsReceiver(v []interface{}) *[]insights.SmsReceiver { return &receivers } -func expandActionGroupWebHookReceiver(v []interface{}) *[]insights.WebhookReceiver { +func expandMonitorActionGroupWebHookReceiver(v []interface{}) *[]insights.WebhookReceiver { receivers := make([]insights.WebhookReceiver, 0) for _, receiverValue := range v { val := receiverValue.(map[string]interface{}) @@ -272,7 +272,7 @@ func expandActionGroupWebHookReceiver(v []interface{}) *[]insights.WebhookReceiv return &receivers } -func flattenActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) []interface{} { +func flattenMonitorActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) []interface{} { result := make([]interface{}, 0) if receivers != nil { for _, receiver := range *receivers { @@ -285,7 +285,7 @@ func flattenActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) []inte return result } -func flattenActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []interface{} { +func flattenMonitorActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []interface{} { result := make([]interface{}, 0) if receivers != nil { for _, receiver := range *receivers { @@ -299,7 +299,7 @@ func flattenActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []interfac return result } -func flattenActionGroupWebHookReceiver(receivers *[]insights.WebhookReceiver) []interface{} { +func flattenMonitorActionGroupWebHookReceiver(receivers *[]insights.WebhookReceiver) []interface{} { result := make([]interface{}, 0) if receivers != nil { for _, receiver := range *receivers { diff --git a/azurerm/resource_arm_action_group_test.go b/azurerm/resource_arm_monitor_action_group_test.go similarity index 76% rename from azurerm/resource_arm_action_group_test.go rename to azurerm/resource_arm_monitor_action_group_test.go index 34d68022ed67..cad73ff10314 100644 --- a/azurerm/resource_arm_action_group_test.go +++ b/azurerm/resource_arm_monitor_action_group_test.go @@ -10,20 +10,20 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAzureRMActionGroup_basic(t *testing.T) { - resourceName := "azurerm_action_group.test" +func TestAccAzureRMMonitorActionGroup_basic(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" ri := acctest.RandInt() - config := testAccAzureRMActionGroup_basic(ri, testLocation()) + config := testAccAzureRMMonitorActionGroup_basic(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, Steps: []resource.TestStep{ { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMActionGroupExists(resourceName), + testCheckAzureRMMonitorActionGroupExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "true"), resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "2"), resource.TestCheckResourceAttr(resourceName, "email_receiver.0.email_address", "admin@contoso.com"), @@ -44,20 +44,20 @@ func TestAccAzureRMActionGroup_basic(t *testing.T) { }) } -func TestAccAzureRMActionGroup_empty(t *testing.T) { - resourceName := "azurerm_action_group.test" +func TestAccAzureRMMonitorActionGroup_empty(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" ri := acctest.RandInt() - config := testAccAzureRMActionGroup_empty(ri, testLocation()) + config := testAccAzureRMMonitorActionGroup_empty(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, Steps: []resource.TestStep{ { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMActionGroupExists(resourceName), + testCheckAzureRMMonitorActionGroupExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "true"), resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), @@ -73,36 +73,36 @@ func TestAccAzureRMActionGroup_empty(t *testing.T) { }) } -func TestAccAzureRMActionGroup_disabledEmpty(t *testing.T) { - resourceName := "azurerm_action_group.test" +func TestAccAzureRMMonitorActionGroup_disabledEmpty(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" ri := acctest.RandInt() location := testLocation() - preConfig := testAccAzureRMActionGroup_disabledEmpty(ri, location) - postConfig := testAccAzureRMActionGroup_empty(ri, location) + preConfig := testAccAzureRMMonitorActionGroup_disabledEmpty(ri, location) + postConfig := testAccAzureRMMonitorActionGroup_empty(ri, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMActionGroupDestroy, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, Steps: []resource.TestStep{ { Config: preConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMActionGroupExists(resourceName), + testCheckAzureRMMonitorActionGroupExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "false"), ), }, { Config: postConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMActionGroupExists(resourceName), + testCheckAzureRMMonitorActionGroupExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "true"), ), }, { Config: preConfig, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMActionGroupExists(resourceName), + testCheckAzureRMMonitorActionGroupExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "false"), ), }, @@ -115,14 +115,14 @@ func TestAccAzureRMActionGroup_disabledEmpty(t *testing.T) { }) } -func testAccAzureRMActionGroup_basic(rInt int, location string) string { +func testAccAzureRMMonitorActionGroup_basic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" } -resource "azurerm_action_group" "test" { +resource "azurerm_monitor_action_group" "test" { name = "acctestActionGroup-%d" location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" @@ -152,14 +152,14 @@ resource "azurerm_action_group" "test" { `, rInt, location, rInt) } -func testAccAzureRMActionGroup_empty(rInt int, location string) string { +func testAccAzureRMMonitorActionGroup_empty(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" } -resource "azurerm_action_group" "test" { +resource "azurerm_monitor_action_group" "test" { name = "acctestActionGroup-%d" location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" @@ -168,14 +168,14 @@ resource "azurerm_action_group" "test" { `, rInt, location, rInt) } -func testAccAzureRMActionGroup_disabledEmpty(rInt int, location string) string { +func testAccAzureRMMonitorActionGroup_disabledEmpty(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" } -resource "azurerm_action_group" "test" { +resource "azurerm_monitor_action_group" "test" { name = "acctestActionGroup-%d" location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" @@ -185,12 +185,12 @@ resource "azurerm_action_group" "test" { `, rInt, location, rInt) } -func testCheckAzureRMActionGroupDestroy(s *terraform.State) error { +func testCheckAzureRMMonitorActionGroupDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*ArmClient).actionGroupsClient ctx := testAccProvider.Meta().(*ArmClient).StopContext for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_action_group" { + if rs.Type != "azurerm_monitor_action_group" { continue } @@ -211,7 +211,7 @@ func testCheckAzureRMActionGroupDestroy(s *terraform.State) error { return nil } -func testCheckAzureRMActionGroupExists(name string) resource.TestCheckFunc { +func testCheckAzureRMMonitorActionGroupExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[name] diff --git a/website/azurerm.erb b/website/azurerm.erb index 849fb7c5ff38..9490a09c9f97 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -688,8 +688,8 @@ > Monitor Resources
      - > - azurerm_action_group + > + azurerm_monitor_action_group > diff --git a/website/docs/r/action_group.html.markdown b/website/docs/r/monitor_action_group.html.markdown similarity index 87% rename from website/docs/r/action_group.html.markdown rename to website/docs/r/monitor_action_group.html.markdown index 5a19c9396bfa..9c194970587f 100644 --- a/website/docs/r/action_group.html.markdown +++ b/website/docs/r/monitor_action_group.html.markdown @@ -1,13 +1,13 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_action_group" -sidebar_current: "docs-azurerm-resource-action-group" +page_title: "Azure Resource Manager: azurerm_monitor_action_group" +sidebar_current: "docs-azurerm-resource-monitor-action-group" description: |- Manages an Action Group of Azure monitoring service --- -# azurerm_action_group +# azurerm_monitor_action_group Manages an Action Group of Azure monitoring service. @@ -19,7 +19,7 @@ resource "azurerm_resource_group" "test" { location = "West US" } -resource "azurerm_action_group" "test" { +resource "azurerm_monitor_action_group" "test" { name = "CriticalAlertsAction" location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" @@ -88,12 +88,12 @@ The following arguments are supported: The following attributes are exported: -* `id` - The Route ID. +* `id` - The Action Group ID. ## Import Action Groups can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_action_group.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/actionGroups/myagname +terraform import azurerm_monitor_action_group.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/actionGroups/myagname ``` From 2fb2a06de187fc21561cabc549b0d1dc3026d50b Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Mon, 6 Aug 2018 18:03:48 -0700 Subject: [PATCH 12/15] Fix minor issues according to the feedback --- azurerm/resource_arm_monitor_action_group.go | 20 +++++++++---------- website/azurerm.erb | 2 +- .../docs/r/monitor_action_group.html.markdown | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/azurerm/resource_arm_monitor_action_group.go b/azurerm/resource_arm_monitor_action_group.go index 1f9ddd4c3276..160c6c430f40 100644 --- a/azurerm/resource_arm_monitor_action_group.go +++ b/azurerm/resource_arm_monitor_action_group.go @@ -148,15 +148,15 @@ func resourceArmMonitorActionGroupCreateOrUpdate(d *schema.ResourceData, meta in _, err := client.CreateOrUpdate(ctx, resGroup, name, parameters) if err != nil { - return fmt.Errorf("Error creating or updating action group %s (resource group %s): %+v", name, resGroup, err) + 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 %s (resource group %s) after creation: %+v", name, resGroup, err) + 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 %s (resource group %s) ID is empty", name, resGroup) + return fmt.Errorf("Action group %q (resource group %q) ID is empty", name, resGroup) } d.SetId(*read.ID) @@ -170,7 +170,7 @@ func resourceArmMonitorActionGroupRead(d *schema.ResourceData, meta interface{}) id, err := parseAzureResourceID(d.Id()) if err != nil { - return fmt.Errorf("Error parsing action group resource ID \"%s\" during get: %+v", d.Id(), err) + return err } resGroup := id.ResourceGroup name := id.Path["actionGroups"] @@ -181,7 +181,7 @@ func resourceArmMonitorActionGroupRead(d *schema.ResourceData, meta interface{}) d.SetId("") return nil } - return fmt.Errorf("Error getting action group %s (resource group %s): %+v", name, resGroup, err) + return fmt.Errorf("Error getting action group %q (resource group %q): %+v", name, resGroup, err) } d.Set("name", name) @@ -194,15 +194,15 @@ func resourceArmMonitorActionGroupRead(d *schema.ResourceData, meta interface{}) d.Set("enabled", *resp.Enabled) if err = d.Set("email_receiver", flattenMonitorActionGroupEmailReceiver(resp.EmailReceivers)); err != nil { - return fmt.Errorf("Error setting `email_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) + 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.SmsReceivers)); err != nil { - return fmt.Errorf("Error setting `sms_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) + 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.WebhookReceivers)); err != nil { - return fmt.Errorf("Error setting `webhook_receiver` of action group %s (resource group %s): %+v", name, resGroup, err) + return fmt.Errorf("Error setting `webhook_receiver` of action group %q (resource group %q): %+v", name, resGroup, err) } flattenAndSetTags(d, resp.Tags) @@ -216,7 +216,7 @@ func resourceArmMonitorActionGroupDelete(d *schema.ResourceData, meta interface{ id, err := parseAzureResourceID(d.Id()) if err != nil { - return fmt.Errorf("Error parsing action group resource ID \"%s\" during delete: %+v", d.Id(), err) + return err } resGroup := id.ResourceGroup name := id.Path["actionGroups"] @@ -226,7 +226,7 @@ func resourceArmMonitorActionGroupDelete(d *schema.ResourceData, meta interface{ if response.WasNotFound(resp.Response) { return nil } - return fmt.Errorf("Error deleting action group %s (resource group %s): %+v", name, resGroup, err) + return fmt.Errorf("Error deleting action group %q (resource group %q): %+v", name, resGroup, err) } return nil diff --git a/website/azurerm.erb b/website/azurerm.erb index 9490a09c9f97..442b3fd80e51 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -685,7 +685,7 @@ - > + > Monitor Resources
        > diff --git a/website/docs/r/monitor_action_group.html.markdown b/website/docs/r/monitor_action_group.html.markdown index 9c194970587f..d00d413f616d 100644 --- a/website/docs/r/monitor_action_group.html.markdown +++ b/website/docs/r/monitor_action_group.html.markdown @@ -57,9 +57,9 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which to create the Action Group instance. * `short_name` - (Required) The short name of the action group. This will be used in SMS messages. * `enabled` - (Optional) Whether this action group is enabled. If an action group is not enabled, then none of its receivers will receive communications. Defaults to `true`. -* `email_receiver` - (Optional) The list of `email_receiver` blocks as defined below that are part of this action group. -* `sms_receiver` - (Optional) The list of `sms_receiver` blocks as defined below that are part of this action group. -* `webhook_receiver` - (Optional) The list of `webhook_receiver` blocks as defined below that are part of this action group. +* `email_receiver` - (Optional) One or more `email_receiver` blocks as defined below. +* `sms_receiver` - (Optional) One or more `sms_receiver ` blocks as defined below. +* `webhook_receiver` - (Optional) One or more `webhook_receiver ` blocks as defined below. * `tags` - (Optional) A mapping of tags to assign to the resource. --- @@ -88,7 +88,7 @@ The following arguments are supported: The following attributes are exported: -* `id` - The Action Group ID. +* `id` - The ID of the Monitor Action Group. ## Import From b545939bc315127013205e30c2ff646a3a9550d0 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Mon, 6 Aug 2018 18:26:50 -0700 Subject: [PATCH 13/15] Change the code logic according to the feedback --- azurerm/resource_arm_monitor_action_group.go | 74 ++++++++++--------- .../docs/r/monitor_action_group.html.markdown | 2 - 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/azurerm/resource_arm_monitor_action_group.go b/azurerm/resource_arm_monitor_action_group.go index 160c6c430f40..d23ab2ed0d61 100644 --- a/azurerm/resource_arm_monitor_action_group.go +++ b/azurerm/resource_arm_monitor_action_group.go @@ -28,8 +28,6 @@ func resourceArmMonitorActionGroup() *schema.Resource { ValidateFunc: validation.NoZeroValues, }, - "location": locationSchema(), - "resource_group_name": resourceGroupNameSchema(), "short_name": { @@ -116,36 +114,30 @@ func resourceArmMonitorActionGroupCreateOrUpdate(d *schema.ResourceData, meta in ctx := meta.(*ArmClient).StopContext name := d.Get("name").(string) - location := azureRMNormalizeLocation(d.Get("location").(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: &location, + Location: utils.String(azureRMNormalizeLocation("Global")), ActionGroup: &insights.ActionGroup{ - GroupShortName: &shortName, - Enabled: &enabled, + GroupShortName: &shortName, + Enabled: &enabled, + EmailReceivers: expandMonitorActionGroupEmailReceiver(emailReceiversRaw), + SmsReceivers: expandMonitorActionGroupSmsReceiver(smsReceiversRaw), + WebhookReceivers: expandMonitorActionGroupWebHookReceiver(webhookReceiversRaw), }, Tags: expandedTags, } - if v, ok := d.GetOk("email_receiver"); ok { - parameters.ActionGroup.EmailReceivers = expandMonitorActionGroupEmailReceiver(v.([]interface{})) - } - - if v, ok := d.GetOk("sms_receiver"); ok { - parameters.ActionGroup.SmsReceivers = expandMonitorActionGroupSmsReceiver(v.([]interface{})) - } - - if v, ok := d.GetOk("webhook_receiver"); ok { - parameters.ActionGroup.WebhookReceivers = expandMonitorActionGroupWebHookReceiver(v.([]interface{})) - } - _, 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) @@ -186,22 +178,19 @@ func resourceArmMonitorActionGroupRead(d *schema.ResourceData, meta interface{}) d.Set("name", name) d.Set("resource_group_name", resGroup) - if location := resp.Location; location != nil { - d.Set("location", azureRMNormalizeLocation(*location)) - } - d.Set("short_name", *resp.GroupShortName) - d.Set("enabled", *resp.Enabled) + d.Set("short_name", resp.ActionGroup.GroupShortName) + d.Set("enabled", resp.ActionGroup.Enabled) - if err = d.Set("email_receiver", flattenMonitorActionGroupEmailReceiver(resp.EmailReceivers)); err != nil { + 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.SmsReceivers)); err != nil { + 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.WebhookReceivers)); err != nil { + 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) } @@ -223,10 +212,9 @@ func resourceArmMonitorActionGroupDelete(d *schema.ResourceData, meta interface{ resp, err := client.Delete(ctx, resGroup, name) if err != nil { - if response.WasNotFound(resp.Response) { - return nil + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting action group %q (resource group %q): %+v", name, resGroup, err) } - return fmt.Errorf("Error deleting action group %q (resource group %q): %+v", name, resGroup, err) } return nil @@ -277,8 +265,12 @@ func flattenMonitorActionGroupEmailReceiver(receivers *[]insights.EmailReceiver) if receivers != nil { for _, receiver := range *receivers { val := make(map[string]interface{}, 0) - val["name"] = *receiver.Name - val["email_address"] = *receiver.EmailAddress + if receiver.Name != nil { + val["name"] = *receiver.Name + } + if receiver.EmailAddress != nil { + val["email_address"] = *receiver.EmailAddress + } result = append(result, val) } } @@ -290,9 +282,15 @@ func flattenMonitorActionGroupSmsReceiver(receivers *[]insights.SmsReceiver) []i if receivers != nil { for _, receiver := range *receivers { val := make(map[string]interface{}, 0) - val["name"] = *receiver.Name - val["country_code"] = *receiver.CountryCode - val["phone_number"] = *receiver.PhoneNumber + 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) } } @@ -304,8 +302,12 @@ func flattenMonitorActionGroupWebHookReceiver(receivers *[]insights.WebhookRecei if receivers != nil { for _, receiver := range *receivers { val := make(map[string]interface{}, 0) - val["name"] = *receiver.Name - val["service_uri"] = *receiver.ServiceURI + if receiver.Name != nil { + val["name"] = *receiver.Name + } + if receiver.ServiceURI != nil { + val["service_uri"] = *receiver.ServiceURI + } result = append(result, val) } } diff --git a/website/docs/r/monitor_action_group.html.markdown b/website/docs/r/monitor_action_group.html.markdown index d00d413f616d..3ef05d5eb304 100644 --- a/website/docs/r/monitor_action_group.html.markdown +++ b/website/docs/r/monitor_action_group.html.markdown @@ -21,7 +21,6 @@ resource "azurerm_resource_group" "test" { resource "azurerm_monitor_action_group" "test" { name = "CriticalAlertsAction" - location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" short_name = "p0action" @@ -53,7 +52,6 @@ resource "azurerm_monitor_action_group" "test" { The following arguments are supported: * `name` - (Required) The name of the Action Group. Changing this forces a new resource to be created. -* `location` - (Required) The location of this Action Group. The only possible value is `Global`. * `resource_group_name` - (Required) The name of the resource group in which to create the Action Group instance. * `short_name` - (Required) The short name of the action group. This will be used in SMS messages. * `enabled` - (Optional) Whether this action group is enabled. If an action group is not enabled, then none of its receivers will receive communications. Defaults to `true`. From a0236f50443e5b2e0d7455c366021178b20f6f80 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Mon, 6 Aug 2018 19:00:06 -0700 Subject: [PATCH 14/15] Add more test scenarios from the feedback --- .../resource_arm_monitor_action_group_test.go | 307 ++++++++++++++++-- 1 file changed, 285 insertions(+), 22 deletions(-) diff --git a/azurerm/resource_arm_monitor_action_group_test.go b/azurerm/resource_arm_monitor_action_group_test.go index cad73ff10314..48e0a8a8fd13 100644 --- a/azurerm/resource_arm_monitor_action_group_test.go +++ b/azurerm/resource_arm_monitor_action_group_test.go @@ -25,14 +25,70 @@ func TestAccAzureRMMonitorActionGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorActionGroupExists(resourceName), resource.TestCheckResourceAttr(resourceName, "enabled", "true"), - resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMMonitorActionGroup_emailReceiver(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" + ri := acctest.RandInt() + config := testAccAzureRMMonitorActionGroup_emailReceiver(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "1"), resource.TestCheckResourceAttr(resourceName, "email_receiver.0.email_address", "admin@contoso.com"), - resource.TestCheckResourceAttr(resourceName, "email_receiver.1.email_address", "devops@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMMonitorActionGroup_smsReceiver(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" + ri := acctest.RandInt() + config := testAccAzureRMMonitorActionGroup_smsReceiver(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "1"), resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.country_code", "1"), resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.phone_number", "1231231234"), - resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "1"), - resource.TestCheckResourceAttr(resourceName, "webhook_receiver.0.service_uri", "http://example.com/alert"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), ), }, { @@ -44,10 +100,10 @@ func TestAccAzureRMMonitorActionGroup_basic(t *testing.T) { }) } -func TestAccAzureRMMonitorActionGroup_empty(t *testing.T) { +func TestAccAzureRMMonitorActionGroup_webhookReceiver(t *testing.T) { resourceName := "azurerm_monitor_action_group.test" ri := acctest.RandInt() - config := testAccAzureRMMonitorActionGroup_empty(ri, testLocation()) + config := testAccAzureRMMonitorActionGroup_webhookReceiver(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -61,7 +117,45 @@ func TestAccAzureRMMonitorActionGroup_empty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "enabled", "true"), resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), - resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "1"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.0.service_uri", "http://example.com/alert"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMMonitorActionGroup_complete(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" + ri := acctest.RandInt() + config := testAccAzureRMMonitorActionGroup_complete(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.0.email_address", "admin@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.1.email_address", "devops@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.country_code", "1"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.phone_number", "1231231234"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.1.country_code", "86"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.1.phone_number", "13888888888"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.0.service_uri", "http://example.com/alert"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.1.service_uri", "https://backup.example.com/warning"), ), }, { @@ -73,12 +167,12 @@ func TestAccAzureRMMonitorActionGroup_empty(t *testing.T) { }) } -func TestAccAzureRMMonitorActionGroup_disabledEmpty(t *testing.T) { +func TestAccAzureRMMonitorActionGroup_disabledUpdate(t *testing.T) { resourceName := "azurerm_monitor_action_group.test" ri := acctest.RandInt() location := testLocation() - preConfig := testAccAzureRMMonitorActionGroup_disabledEmpty(ri, location) - postConfig := testAccAzureRMMonitorActionGroup_empty(ri, location) + preConfig := testAccAzureRMMonitorActionGroup_disabledBasic(ri, location) + postConfig := testAccAzureRMMonitorActionGroup_basic(ri, location) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -106,10 +200,110 @@ func TestAccAzureRMMonitorActionGroup_disabledEmpty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "enabled", "false"), ), }, + }, + }) +} + +func TestAccAzureRMMonitorActionGroup_singleReceiverUpdate(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" + ri := acctest.RandInt() + location := testLocation() + emailConfig := testAccAzureRMMonitorActionGroup_emailReceiver(ri, location) + smsConfig := testAccAzureRMMonitorActionGroup_smsReceiver(ri, location) + webhookConfig := testAccAzureRMMonitorActionGroup_webhookReceiver(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, + Steps: []resource.TestStep{ { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + Config: emailConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "1"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.0.email_address", "admin@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + ), + }, + { + Config: smsConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "1"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.country_code", "1"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.phone_number", "1231231234"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + ), + }, + { + Config: webhookConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "1"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.0.service_uri", "http://example.com/alert"), + ), + }, + }, + }) +} + +func TestAccAzureRMMonitorActionGroup_multipleReceiversUpdate(t *testing.T) { + resourceName := "azurerm_monitor_action_group.test" + ri := acctest.RandInt() + location := testLocation() + basicConfig := testAccAzureRMMonitorActionGroup_basic(ri, location) + completeConfig := testAccAzureRMMonitorActionGroup_complete(ri, location) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorActionGroupDestroy, + Steps: []resource.TestStep{ + { + Config: basicConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + ), + }, + { + Config: completeConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.0.email_address", "admin@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.1.email_address", "devops@contoso.com"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.country_code", "1"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.0.phone_number", "1231231234"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.1.country_code", "86"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.1.phone_number", "13888888888"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "2"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.0.service_uri", "http://example.com/alert"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.1.service_uri", "https://backup.example.com/warning"), + ), + }, + { + Config: basicConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorActionGroupExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "email_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "sms_receiver.#", "0"), + resource.TestCheckResourceAttr(resourceName, "webhook_receiver.#", "0"), + ), }, }, }) @@ -124,7 +318,21 @@ resource "azurerm_resource_group" "test" { resource "azurerm_monitor_action_group" "test" { name = "acctestActionGroup-%d" - location = "Global" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} +`, rInt, location, rInt) +} + +func testAccAzureRMMonitorActionGroup_emailReceiver(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" resource_group_name = "${azurerm_resource_group.test.name}" short_name = "acctestag" @@ -132,17 +340,42 @@ resource "azurerm_monitor_action_group" "test" { name = "sendtoadmin" email_address = "admin@contoso.com" } +} +`, rInt, location, rInt) +} - email_receiver { - name = "sendtodevops" - email_address = "devops@contoso.com" - } +func testAccAzureRMMonitorActionGroup_smsReceiver(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" sms_receiver { name = "oncallmsg" country_code = "1" phone_number = "1231231234" } +} +`, rInt, location, rInt) +} + +func testAccAzureRMMonitorActionGroup_webhookReceiver(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" webhook_receiver { name = "callmyapiaswell" @@ -152,7 +385,7 @@ resource "azurerm_monitor_action_group" "test" { `, rInt, location, rInt) } -func testAccAzureRMMonitorActionGroup_empty(rInt int, location string) string { +func testAccAzureRMMonitorActionGroup_complete(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -161,14 +394,45 @@ resource "azurerm_resource_group" "test" { resource "azurerm_monitor_action_group" "test" { name = "acctestActionGroup-%d" - location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" short_name = "acctestag" + + email_receiver { + name = "sendtoadmin" + email_address = "admin@contoso.com" + } + + email_receiver { + name = "sendtodevops" + email_address = "devops@contoso.com" + } + + sms_receiver { + name = "oncallmsg" + country_code = "1" + phone_number = "1231231234" + } + + sms_receiver { + name = "remotesupport" + country_code = "86" + phone_number = "13888888888" + } + + webhook_receiver { + name = "callmyapiaswell" + service_uri = "http://example.com/alert" + } + + webhook_receiver { + name = "callmybackupapi" + service_uri = "https://backup.example.com/warning" + } } `, rInt, location, rInt) } -func testAccAzureRMMonitorActionGroup_disabledEmpty(rInt int, location string) string { +func testAccAzureRMMonitorActionGroup_disabledBasic(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -177,7 +441,6 @@ resource "azurerm_resource_group" "test" { resource "azurerm_monitor_action_group" "test" { name = "acctestActionGroup-%d" - location = "Global" resource_group_name = "${azurerm_resource_group.test.name}" short_name = "acctestag" enabled = false From 598e26433ad6ebfe9c5ddd45741a42f5cbe60573 Mon Sep 17 00:00:00 2001 From: Junyi Yi Date: Thu, 9 Aug 2018 18:41:35 -0700 Subject: [PATCH 15/15] Fix code according to the 16th iteration --- azurerm/provider.go | 2 +- azurerm/resource_arm_monitor_action_group.go | 28 ++++++++++--------- .../docs/r/monitor_action_group.html.markdown | 6 ++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/azurerm/provider.go b/azurerm/provider.go index 94475d49c80e..4c6478f94e26 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -122,7 +122,6 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ - "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), "azurerm_azuread_service_principal": resourceArmActiveDirectoryServicePrincipal(), "azurerm_azuread_service_principal_password": resourceArmActiveDirectoryServicePrincipalPassword(), @@ -197,6 +196,7 @@ func Provider() terraform.ResourceProvider { "azurerm_managed_disk": resourceArmManagedDisk(), "azurerm_management_lock": resourceArmManagementLock(), "azurerm_metric_alertrule": resourceArmMetricAlertRule(), + "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), "azurerm_mysql_database": resourceArmMySqlDatabase(), "azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(), diff --git a/azurerm/resource_arm_monitor_action_group.go b/azurerm/resource_arm_monitor_action_group.go index d23ab2ed0d61..4abbcd7ca4bc 100644 --- a/azurerm/resource_arm_monitor_action_group.go +++ b/azurerm/resource_arm_monitor_action_group.go @@ -33,7 +33,7 @@ func resourceArmMonitorActionGroup() *schema.Resource { "short_name": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.NoZeroValues, + ValidateFunc: validation.StringLenBetween(1, 12), }, "enabled": { @@ -129,8 +129,8 @@ func resourceArmMonitorActionGroupCreateOrUpdate(d *schema.ResourceData, meta in parameters := insights.ActionGroupResource{ Location: utils.String(azureRMNormalizeLocation("Global")), ActionGroup: &insights.ActionGroup{ - GroupShortName: &shortName, - Enabled: &enabled, + GroupShortName: utils.String(shortName), + Enabled: utils.Bool(enabled), EmailReceivers: expandMonitorActionGroupEmailReceiver(emailReceiversRaw), SmsReceivers: expandMonitorActionGroupSmsReceiver(smsReceiversRaw), WebhookReceivers: expandMonitorActionGroupWebHookReceiver(webhookReceiversRaw), @@ -179,19 +179,21 @@ func resourceArmMonitorActionGroupRead(d *schema.ResourceData, meta interface{}) d.Set("name", name) d.Set("resource_group_name", resGroup) - d.Set("short_name", resp.ActionGroup.GroupShortName) - d.Set("enabled", resp.ActionGroup.Enabled) + if group := resp.ActionGroup; group != nil { + d.Set("short_name", group.GroupShortName) + d.Set("enabled", group.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("email_receiver", flattenMonitorActionGroupEmailReceiver(group.EmailReceivers)); err != nil { + return fmt.Errorf("Error setting `email_receiver`: %+v", 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("sms_receiver", flattenMonitorActionGroupSmsReceiver(group.SmsReceivers)); err != nil { + return fmt.Errorf("Error setting `sms_receiver`: %+v", 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) + if err = d.Set("webhook_receiver", flattenMonitorActionGroupWebHookReceiver(group.WebhookReceivers)); err != nil { + return fmt.Errorf("Error setting `webhook_receiver`: %+v", err) + } } flattenAndSetTags(d, resp.Tags) diff --git a/website/docs/r/monitor_action_group.html.markdown b/website/docs/r/monitor_action_group.html.markdown index 3ef05d5eb304..3d09ab330ee7 100644 --- a/website/docs/r/monitor_action_group.html.markdown +++ b/website/docs/r/monitor_action_group.html.markdown @@ -3,13 +3,13 @@ layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_action_group" sidebar_current: "docs-azurerm-resource-monitor-action-group" description: |- - Manages an Action Group of Azure monitoring service + Manages an Action Group within Azure Monitor --- # azurerm_monitor_action_group -Manages an Action Group of Azure monitoring service. +Manages an Action Group within Azure Monitor. ## Example Usage @@ -86,7 +86,7 @@ The following arguments are supported: The following attributes are exported: -* `id` - The ID of the Monitor Action Group. +* `id` - The ID of the Action Group. ## Import