From 31c08a11dbc3185c820523a62fb12d1e101d7343 Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Tue, 28 Apr 2020 12:05:17 +0800 Subject: [PATCH 1/6] new resource "azurerm_maintenance_assignment" --- .../services/maintenance/client/client.go | 9 +- .../parse/maintenance_assignment.go | 96 +++++ .../parse/maintenance_assignment_test.go | 121 ++++++ .../services/maintenance/registration.go | 1 + .../resource_arm_maintenance_assignment.go | 177 +++++++++ ...esource_arm_maintenance_assignment_test.go | 349 ++++++++++++++++++ .../validate/maintenance_configuration.go | 22 ++ website/azurerm.erb | 4 + .../r/maintenance_assignment.html.markdown | 123 ++++++ 9 files changed, 900 insertions(+), 2 deletions(-) create mode 100644 azurerm/internal/services/maintenance/parse/maintenance_assignment.go create mode 100644 azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go create mode 100644 azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go create mode 100644 azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go create mode 100644 azurerm/internal/services/maintenance/validate/maintenance_configuration.go create mode 100644 website/docs/r/maintenance_assignment.html.markdown diff --git a/azurerm/internal/services/maintenance/client/client.go b/azurerm/internal/services/maintenance/client/client.go index 5fb54aed666c..4205000e7e4e 100644 --- a/azurerm/internal/services/maintenance/client/client.go +++ b/azurerm/internal/services/maintenance/client/client.go @@ -6,14 +6,19 @@ import ( ) type Client struct { - ConfigurationsClient *maintenance.ConfigurationsClient + ConfigurationsClient *maintenance.ConfigurationsClient + ConfigurationAssignmentsClient *maintenance.ConfigurationAssignmentsClient } func NewClient(o *common.ClientOptions) *Client { configurationsClient := maintenance.NewConfigurationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&configurationsClient.Client, o.ResourceManagerAuthorizer) + configurationAssignmentsClient := maintenance.NewConfigurationAssignmentsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&configurationAssignmentsClient.Client, o.ResourceManagerAuthorizer) + return &Client{ - ConfigurationsClient: &configurationsClient, + ConfigurationsClient: &configurationsClient, + ConfigurationAssignmentsClient: &configurationAssignmentsClient, } } diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment.go new file mode 100644 index 000000000000..c2f62cbcc2ca --- /dev/null +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment.go @@ -0,0 +1,96 @@ +package parse + +import ( + "fmt" + "regexp" + "strings" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type MaintenanceAssignmentId struct { + *TargetResourceId + ResourceId string + Name string +} + +func MaintenanceAssignmentID(input string) (*MaintenanceAssignmentId, error) { + // two types of ID: + // 1: /subscriptions//resourcegroups//providers/microsoft.compute/virtualmachines//providers/Microsoft.Maintenance/configurationAssignments/ + // 2: /subscriptions//resourcegroups//providers//////providers/Microsoft.Maintenance/configurationAssignments/ + groups := regexp.MustCompile(`^(.+)/providers/Microsoft\.Maintenance/configurationAssignments/([^/]+)$`).FindStringSubmatch(input) + if len(groups) != 3 { + return nil, fmt.Errorf("parsing Maintenance Assignment ID: %q", input) + } + + targetResourceId, name := groups[1], groups[2] + id, err := TargetResourceID(targetResourceId) + if err != nil { + return nil, err + } + + return &MaintenanceAssignmentId{ + TargetResourceId: id, + ResourceId: targetResourceId, + Name: name, + }, nil +} + +type TargetResourceId struct { + HasParentResource bool + ResourceGroup string + ResourceProvider string + ResourceParentType string + ResourceParentName string + ResourceType string + ResourceName string +} + +func TargetResourceID(input string) (*TargetResourceId, error) { + // two types of ID: + // 1: /subscriptions//resourcegroups//providers/// + // 2: /subscriptions//resourcegroups//providers///// + + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("parsing target resource id %q: %+v", input, err) + } + + var resourceParentType, resourceParentName, resourceType, resourceName string + var hasParentResource bool + if len(id.Path) != 1 && len(id.Path) != 2 { + return nil, fmt.Errorf("parsing target resource id %q: %+v", input, err) + } + + if len(id.Path) == 1 { + // assume there is only one left key value pair + for k, v := range id.Path { + resourceType = k + resourceName = v + } + } else { + hasParentResource = true + + input = strings.TrimPrefix(input, "/") + input = strings.TrimSuffix(input, "/") + groups := regexp.MustCompile(`^subscriptions/.+/resource[gG]roups/.+/providers/.+/(.+)/(.+)/(.+)/(.+)$`).FindStringSubmatch(input) + if len(groups) != 5 { + return nil, fmt.Errorf("parsing target resource id: %q", input) + } + + resourceParentType = groups[1] + resourceParentName = groups[2] + resourceType = groups[3] + resourceName = groups[4] + } + + return &TargetResourceId{ + ResourceGroup: id.ResourceGroup, + ResourceProvider: id.Provider, + ResourceParentType: resourceParentType, + ResourceParentName: resourceParentName, + ResourceType: resourceType, + ResourceName: resourceName, + HasParentResource: hasParentResource, + }, nil +} diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go new file mode 100644 index 000000000000..7b535afa6ca3 --- /dev/null +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go @@ -0,0 +1,121 @@ +package parse + +import ( + "testing" +) + +func TestMaintenanceAssignmentID(t *testing.T) { + testData := []struct { + Name string + Input string + Error bool + Expect *MaintenanceAssignmentId + }{ + { + Name: "Empty", + Input: "", + Error: true, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Error: true, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Error: true, + }, + { + Name: "No target resource type", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/", + Error: true, + }, + { + Name: "No target resource name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/", + Error: true, + }, + { + Name: "No Maintenance Assignment Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/", + Error: true, + }, + { + Name: "No Maintenance Assignment name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/", + Error: true, + }, + { + Name: "ID of Maintenance Assignment to vm", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/assign1", + Error: false, + Expect: &MaintenanceAssignmentId{ + TargetResourceId: &TargetResourceId{ + HasParentResource: false, + ResourceGroup: "resGroup1", + ResourceProvider: "microsoft.compute", + ResourceType: "virtualmachines", + ResourceName: "vm1", + }, + ResourceId: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1", + Name: "assign1", + }, + }, + { + Name: "ID of Maintenance Assignment to dedicated host", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/configurationAssignments/assign1", + Error: false, + Expect: &MaintenanceAssignmentId{ + TargetResourceId: &TargetResourceId{ + HasParentResource: true, + ResourceGroup: "resGroup1", + ResourceProvider: "microsoft.compute", + ResourceParentType: "hostGroups", + ResourceParentName: "group1", + ResourceType: "hosts", + ResourceName: "host1", + }, + ResourceId: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/hostGroups/group1/hosts/host1", + Name: "assign1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/ConfigurationAssignments/assign1", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q..", v.Name) + + actual, err := MaintenanceAssignmentID(v.Input) + if err != nil { + if v.Expect == nil { + continue + } + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.ResourceGroup != v.Expect.ResourceGroup { + t.Fatalf("Expected %q but got %q for ResourceGroup", v.Expect.ResourceGroup, actual.ResourceGroup) + } + + if actual.ResourceProvider != v.Expect.ResourceProvider { + t.Fatalf("Expected %q but got %q for ResourceProvider", v.Expect.ResourceProvider, actual.ResourceProvider) + } + + if actual.ResourceType != v.Expect.ResourceType { + t.Fatalf("Expected %q but got %q for ResourceType", v.Expect.ResourceType, actual.ResourceType) + } + + if actual.ResourceName != v.Expect.ResourceName { + t.Fatalf("Expected %q but got %q for ResourceName", v.Expect.ResourceName, actual.ResourceName) + } + + if actual.Name != v.Expect.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) + } + } +} diff --git a/azurerm/internal/services/maintenance/registration.go b/azurerm/internal/services/maintenance/registration.go index d461b1a485d8..c624ae833766 100644 --- a/azurerm/internal/services/maintenance/registration.go +++ b/azurerm/internal/services/maintenance/registration.go @@ -24,6 +24,7 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ + "azurerm_maintenance_assignment": resourceArmMaintenanceAssignment(), "azurerm_maintenance_configuration": resourceArmMaintenanceConfiguration(), } } diff --git a/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go b/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go new file mode 100644 index 000000000000..f0f8cf9f1677 --- /dev/null +++ b/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go @@ -0,0 +1,177 @@ +package maintenance + +import ( + "fmt" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" + maintenanceValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/validate" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmMaintenanceAssignment() *schema.Resource { + return &schema.Resource{ + Create: resourceArmMaintenanceAssignmentCreate, + Read: resourceArmMaintenanceAssignmentRead, + Update: nil, + Delete: resourceArmMaintenanceAssignmentDelete, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.MaintenanceAssignmentID(id) + return err + }), + + Schema: map[string]*schema.Schema{ + "location": azure.SchemaLocation(), + + "maintenance_configuration_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: maintenanceValidate.MaintenanceConfigurationID, + }, + + "target_resource_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, + DiffSuppressFunc: suppress.CaseDifference, + }, + }, + } +} + +func resourceArmMaintenanceAssignmentCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + targetResourceId := d.Get("target_resource_id").(string) + id, err := parse.TargetResourceID(targetResourceId) + if err != nil { + return err + } + + var listResp maintenance.ListConfigurationAssignmentsResult + if id.HasParentResource { + listResp, err = client.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) + } else { + listResp, err = client.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) + } + if err != nil { + if !utils.ResponseWasNotFound(listResp.Response) { + return fmt.Errorf("checking for presense of existing Maintenance assignment to resource %q: %+v", targetResourceId, err) + } + } + if listResp.Value != nil && len(*listResp.Value) > 0 { + return tf.ImportAsExistsError("azurerm_maintenance_assignment", *(*listResp.Value)[0].ID) + } + + maintenanceConfigurationID := d.Get("maintenance_configuration_id").(string) + configurationId, _ := parse.MaintenanceConfigurationID(maintenanceConfigurationID) + + // set assignment name to configuration name + assignmentName := configurationId.Name + assignment := maintenance.ConfigurationAssignment{ + Name: utils.String(assignmentName), + Location: utils.String(location.Normalize(d.Get("location").(string))), + ConfigurationAssignmentProperties: &maintenance.ConfigurationAssignmentProperties{ + MaintenanceConfigurationID: utils.String(maintenanceConfigurationID), + ResourceID: utils.String(targetResourceId), + }, + } + + var resp maintenance.ConfigurationAssignment + if id.HasParentResource { + resp, err = client.CreateOrUpdateParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, assignmentName, assignment) + } else { + resp, err = client.CreateOrUpdate(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, assignmentName, assignment) + } + if err != nil { + return fmt.Errorf("creating Maintenance Assignment to resource %q: %+v", targetResourceId, err) + } + + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("cannot read Maintenance Assignment to resource %q", targetResourceId) + } + + d.SetId(*resp.ID) + return resourceArmMaintenanceAssignmentRead(d, meta) +} + +func resourceArmMaintenanceAssignmentRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.MaintenanceAssignmentID(d.Id()) + if err != nil { + return err + } + + var listResp maintenance.ListConfigurationAssignmentsResult + if id.HasParentResource { + listResp, err = client.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) + } else { + listResp, err = client.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) + } + if err != nil { + if !utils.ResponseWasNotFound(listResp.Response) { + return fmt.Errorf("checking for present of existing Maintenance assignment to resource %q: %+v", id.ResourceId, err) + } + return fmt.Errorf("listing Maintenance assignment to resource %q: %+v", id.ResourceId, err) + } + if listResp.Value == nil || len(*listResp.Value) == 0 { + return fmt.Errorf("could not find Maintenance assignment to resource %q", id.ResourceId) + } + + assignment := (*listResp.Value)[0] + if assignment.ID == nil || *assignment.ID == "" { + return fmt.Errorf("cannot read Maintenance Assignment to resource %q ID", id.ResourceId) + } + + // in list api, `ResourceID` returned is always nil + d.Set("target_resource_id", id.ResourceId) + if props := assignment.ConfigurationAssignmentProperties; props != nil { + d.Set("maintenance_configuration_id", props.MaintenanceConfigurationID) + } + return nil +} + +func resourceArmMaintenanceAssignmentDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.MaintenanceAssignmentID(d.Id()) + if err != nil { + return err + } + + if id.HasParentResource { + _, err = client.DeleteParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, id.Name) + } else { + _, err = client.Delete(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, id.Name) + } + if err != nil { + return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.ResourceId, err) + } + + return nil +} diff --git a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go new file mode 100644 index 000000000000..91797befdc5c --- /dev/null +++ b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go @@ -0,0 +1,349 @@ +package tests + +import ( + "fmt" + "testing" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMMaintenanceAssignment_vmBasic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, + Steps: []resource.TestStep{ + { + + Config: testAccAzureRMMaintenanceAssignment_vmTemplate(data), + Check: resource.ComposeTestCheckFunc(), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(3 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_vmBasic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), + ), + }, + // location not returned by list rest api + data.ImportStep("location"), + }, + }) +} + +func TestAccAzureRMMaintenanceAssignment_vmRequiresImport(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, + Steps: []resource.TestStep{ + { + + Config: testAccAzureRMMaintenanceAssignment_vmTemplate(data), + Check: resource.ComposeTestCheckFunc(), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(3 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_vmBasic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), + ), + }, + data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_vmRequiresImport), + }, + }) +} + +func TestAccAzureRMMaintenanceAssignment_dedicatedHostBasic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, + Steps: []resource.TestStep{ + { + + Config: testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data), + Check: resource.ComposeTestCheckFunc(), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(3 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), + ), + }, + data.ImportStep("location"), + }, + }) +} + +func TestAccAzureRMMaintenanceAssignment_dedicatedHostRequiresImport(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, + Steps: []resource.TestStep{ + { + + Config: testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data), + Check: resource.ComposeTestCheckFunc(), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(3 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), + ), + }, + data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_dedicatedHostRequiresImport), + }, + }) +} + +func testCheckAzureRMMaintenanceAssignmentDestroy(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_maintenance_assignment" { + continue + } + + id, err := parse.MaintenanceAssignmentID(rs.Primary.ID) + if err != nil { + return err + } + + var listResp maintenance.ListConfigurationAssignmentsResult + if id.HasParentResource { + listResp, err = conn.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) + } else { + listResp, err = conn.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) + } + + if err != nil { + if !utils.ResponseWasNotFound(listResp.Response) { + return err + } + return nil + } + if listResp.Value != nil && len(*listResp.Value) > 0 { + return fmt.Errorf("maintenance assignment to resource %q still exists", id.ResourceId) + } + + return nil + } + + return nil +} + +func testCheckAzureRMMaintenanceAssignmentExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("not found: %s", resourceName) + } + + id, err := parse.MaintenanceAssignmentID(rs.Primary.ID) + if err != nil { + return err + } + + var listResp maintenance.ListConfigurationAssignmentsResult + if id.HasParentResource { + listResp, err = conn.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) + } else { + listResp, err = conn.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) + } + + if err != nil { + return fmt.Errorf("bad: list on ConfigurationAssignmentsClient: %+v", err) + } + if listResp.Value == nil || len(*listResp.Value) == 0 { + return fmt.Errorf("could not find Maintenance Assignment to resource %q", id.ResourceId) + } + + return nil + } +} + +func testAccAzureRMMaintenanceAssignment_vmBasic(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_vmTemplate(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment" "test" { + location = azurerm_resource_group.test.location + maintenance_configuration_id = azurerm_maintenance_configuration.test.id + target_resource_id = azurerm_linux_virtual_machine.test.id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignment_vmRequiresImport(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_vmBasic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment" "import" { + location = azurerm_maintenance_assignment.test.location + maintenance_configuration_id = azurerm_maintenance_assignment.test.maintenance_configuration_id + target_resource_id = azurerm_maintenance_assignment.test.target_resource_id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment" "test" { + location = azurerm_resource_group.test.location + maintenance_configuration_id = azurerm_maintenance_configuration.test.id + target_resource_id = azurerm_dedicated_host.test.id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignment_dedicatedHostRequiresImport(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment" "import" { + location = azurerm_maintenance_assignment.test.location + maintenance_configuration_id = azurerm_maintenance_assignment.test.maintenance_configuration_id + target_resource_id = azurerm_maintenance_assignment.test.target_resource_id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignment_vmTemplate(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_virtual_network" "test" { + name = "acctestnw-%[2]d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_interface" "test" { + name = "acctni-%[2]d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_linux_virtual_machine" "test" { + name = "acctestVM-%[2]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + size = "Standard_D15_v2" + admin_username = "adminuser" + admin_password = "P@$$w0rd1234!" + + disable_password_authentication = false + + network_interface_ids = [ + azurerm_network_interface.test.id, + ] + + os_disk { + caching = "ReadWrite" + storage_account_type = "Standard_LRS" + } + + source_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } +} +`, template, data.RandomInteger) +} + +func testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_dedicated_host_group" "test" { + name = "acctest-DHG-%[2]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + platform_fault_domain_count = 2 +} + +resource "azurerm_dedicated_host" "test" { + name = "acctest-DH-%[2]d" + location = azurerm_resource_group.test.location + dedicated_host_group_id = azurerm_dedicated_host_group.test.id + sku_name = "DSv3-Type1" + platform_fault_domain = 1 +} +`, template, data.RandomInteger) +} + +func testAccAzureRMMaintenanceAssignment_template(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-maint-%[1]d" + location = "%[2]s" +} + +resource "azurerm_maintenance_configuration" "test" { + name = "acctest-MC%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + scope = "All" +} +`, data.RandomInteger, data.Locations.Primary) +} diff --git a/azurerm/internal/services/maintenance/validate/maintenance_configuration.go b/azurerm/internal/services/maintenance/validate/maintenance_configuration.go new file mode 100644 index 000000000000..aec653423d20 --- /dev/null +++ b/azurerm/internal/services/maintenance/validate/maintenance_configuration.go @@ -0,0 +1,22 @@ +package validate + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" +) + +func MaintenanceConfigurationID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := parse.MaintenanceConfigurationID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} diff --git a/website/azurerm.erb b/website/azurerm.erb index 2bd263ca1e84..735954aa4cc4 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1704,6 +1704,10 @@
  • Maintenance Resources
      +
    • + azurerm_maintenance_assignment +
      • +
    • azurerm_maintenance_configuration
      • diff --git a/website/docs/r/maintenance_assignment.html.markdown b/website/docs/r/maintenance_assignment.html.markdown new file mode 100644 index 000000000000..82210e2bc2d5 --- /dev/null +++ b/website/docs/r/maintenance_assignment.html.markdown @@ -0,0 +1,123 @@ +--- +subcategory: "Maintenance" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_maintenance_assignment" +description: |- + Manages a Maintenance Assignment. +--- + +# azurerm_maintenance_assignment + +Manages a maintenance assignment. + +## Example Usage + +```hcl +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "example" { + name = "example-resources" + location = "West Europe" +} + +resource "azurerm_virtual_network" "example" { + name = "example-network" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name +} + +resource "azurerm_subnet" "example" { + name = "internal" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_interface" "example" { + name = "example-nic" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + + ip_configuration { + name = "internal" + subnet_id = azurerm_subnet.example.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_linux_virtual_machine" "example" { + name = "example-machine" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + size = "Standard_F2" + admin_username = "adminuser" + network_interface_ids = [ + azurerm_network_interface.example.id, + ] + + admin_ssh_key { + username = "adminuser" + public_key = file("~/.ssh/id_rsa.pub") + } + + os_disk { + caching = "ReadWrite" + storage_account_type = "Standard_LRS" + } + + source_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } +} + +resource "azurerm_maintenance_configuration" "example" { + name = "example-mc" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + scope = "All" +} + +resource "azurerm_maintenance_assignment" "example" { + location = azurerm_resource_group.example.location + maintenance_configuration_id = azurerm_maintenance_configuration.example.id + target_resource_id = azurerm_linux_virtual_machine.example.id +} +``` + +## Argument Reference + +The following arguments are supported: + +* `location` - (Required) Specified the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `maintenance_configuration_id` - (Required) Specified the id of Maintenance Configuration Resource. Changing this forces a new resource to be created. + +* `target_resource_id` - (Required) Specified the target resource id where the Maintenance Configuration will be assigned to. Currently, only `Virtual Machine` and `Dedicated Host` resources are supported. Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the Maintenance Assignment. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 30 minutes) Used when creating the Maintenance Assignment. +* `read` - (Defaults to 5 minutes) Used when retrieving the Maintenance Assignment. +* `delete` - (Defaults to 30 minutes) Used when deleting the Maintenance Assignment. + +## Import + +Maintenance Assignment can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_maintenance_assignment.example /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/example-assign +``` From 4feb3c532b2e8aca0c3be7444495c28a0757beba Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Tue, 28 Apr 2020 17:50:39 +0800 Subject: [PATCH 2/6] update --- .../parse/maintenance_assignment.go | 2 +- .../resource_arm_maintenance_assignment.go | 113 ++++++++++-------- ...esource_arm_maintenance_assignment_test.go | 52 ++++---- 3 files changed, 86 insertions(+), 81 deletions(-) diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment.go index c2f62cbcc2ca..48adfc0d9de4 100644 --- a/azurerm/internal/services/maintenance/parse/maintenance_assignment.go +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment.go @@ -59,7 +59,7 @@ func TargetResourceID(input string) (*TargetResourceId, error) { var resourceParentType, resourceParentName, resourceType, resourceName string var hasParentResource bool if len(id.Path) != 1 && len(id.Path) != 2 { - return nil, fmt.Errorf("parsing target resource id %q: %+v", input, err) + return nil, fmt.Errorf("parsing target resource id %q", input) } if len(id.Path) == 1 { diff --git a/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go b/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go index f0f8cf9f1677..b0a340bb9e9c 100644 --- a/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go +++ b/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go @@ -1,18 +1,21 @@ package maintenance import ( + "context" "fmt" "time" "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location" + validateCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" - maintenanceValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/validate" azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -43,14 +46,17 @@ func resourceArmMaintenanceAssignment() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: maintenanceValidate.MaintenanceConfigurationID, + ValidateFunc: validate.MaintenanceConfigurationID, }, "target_resource_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.Any( + validateCompute.DedicatedHostID, + validateCompute.VirtualMachineID, + ), DiffSuppressFunc: suppress.CaseDifference, }, }, @@ -59,28 +65,18 @@ func resourceArmMaintenanceAssignment() *schema.Resource { func resourceArmMaintenanceAssignmentCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() targetResourceId := d.Get("target_resource_id").(string) - id, err := parse.TargetResourceID(targetResourceId) - if err != nil { - return err - } + id, _ := parse.TargetResourceID(targetResourceId) - var listResp maintenance.ListConfigurationAssignmentsResult - if id.HasParentResource { - listResp, err = client.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) - } else { - listResp, err = client.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) - } + existing, err := getMaintenanceAssignment(ctx, client, id, targetResourceId) if err != nil { - if !utils.ResponseWasNotFound(listResp.Response) { - return fmt.Errorf("checking for presense of existing Maintenance assignment to resource %q: %+v", targetResourceId, err) - } + return err } - if listResp.Value != nil && len(*listResp.Value) > 0 { - return tf.ImportAsExistsError("azurerm_maintenance_assignment", *(*listResp.Value)[0].ID) + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_maintenance_assignment", *existing.ID) } maintenanceConfigurationID := d.Get("maintenance_configuration_id").(string) @@ -97,18 +93,16 @@ func resourceArmMaintenanceAssignmentCreate(d *schema.ResourceData, meta interfa }, } - var resp maintenance.ConfigurationAssignment - if id.HasParentResource { - resp, err = client.CreateOrUpdateParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, assignmentName, assignment) - } else { - resp, err = client.CreateOrUpdate(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, assignmentName, assignment) + if _, err := createMaintenanceAssignment(ctx, client, id, assignmentName, &assignment); err != nil { + return fmt.Errorf("creating Maintenance Assignment (target resource id: %q): %+v", targetResourceId, err) } + + resp, err := getMaintenanceAssignment(ctx, client, id, targetResourceId) if err != nil { - return fmt.Errorf("creating Maintenance Assignment to resource %q: %+v", targetResourceId, err) + return err } - if resp.ID == nil || *resp.ID == "" { - return fmt.Errorf("cannot read Maintenance Assignment to resource %q", targetResourceId) + return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id %q)", targetResourceId) } d.SetId(*resp.ID) @@ -125,25 +119,12 @@ func resourceArmMaintenanceAssignmentRead(d *schema.ResourceData, meta interface return err } - var listResp maintenance.ListConfigurationAssignmentsResult - if id.HasParentResource { - listResp, err = client.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) - } else { - listResp, err = client.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) - } + assignment, err := getMaintenanceAssignment(ctx, client, id.TargetResourceId, id.ResourceId) if err != nil { - if !utils.ResponseWasNotFound(listResp.Response) { - return fmt.Errorf("checking for present of existing Maintenance assignment to resource %q: %+v", id.ResourceId, err) - } - return fmt.Errorf("listing Maintenance assignment to resource %q: %+v", id.ResourceId, err) - } - if listResp.Value == nil || len(*listResp.Value) == 0 { - return fmt.Errorf("could not find Maintenance assignment to resource %q", id.ResourceId) + return err } - - assignment := (*listResp.Value)[0] if assignment.ID == nil || *assignment.ID == "" { - return fmt.Errorf("cannot read Maintenance Assignment to resource %q ID", id.ResourceId) + return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id: %q", id.ResourceId) } // in list api, `ResourceID` returned is always nil @@ -164,14 +145,46 @@ func resourceArmMaintenanceAssignmentDelete(d *schema.ResourceData, meta interfa return err } + if _, err := deleteMaintenanceAssignment(ctx, client, id); err != nil { + return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.ResourceId, err) + } + + return nil +} + +func getMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.TargetResourceId, targetResourceId string) (maintenance.ConfigurationAssignment, error) { + var listResp maintenance.ListConfigurationAssignmentsResult + var err error if id.HasParentResource { - _, err = client.DeleteParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, id.Name) + listResp, err = client.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) } else { - _, err = client.Delete(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, id.Name) + listResp, err = client.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) } if err != nil { - return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.ResourceId, err) + if !utils.ResponseWasNotFound(listResp.Response) { + return maintenance.ConfigurationAssignment{}, fmt.Errorf("checking for presence of existing Maintenance assignment (target resource id %q): %+v", targetResourceId, err) + } + return maintenance.ConfigurationAssignment{}, nil + } + if listResp.Value == nil || len(*listResp.Value) == 0 { + return maintenance.ConfigurationAssignment{}, fmt.Errorf("could not find Maintenance assignment (target resource id %q)", targetResourceId) } - return nil + return (*listResp.Value)[0], nil +} + +func createMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.TargetResourceId, assignmentName string, assignment *maintenance.ConfigurationAssignment) (maintenance.ConfigurationAssignment, error) { + if id.HasParentResource { + return client.CreateOrUpdateParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, assignmentName, *assignment) + } else { + return client.CreateOrUpdate(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, assignmentName, *assignment) + } +} + +func deleteMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.MaintenanceAssignmentId) (maintenance.ConfigurationAssignment, error) { + if id.HasParentResource { + return client.DeleteParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, id.Name) + } else { + return client.Delete(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, id.Name) + } } diff --git a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go index 91797befdc5c..fa9c93d4749d 100644 --- a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go +++ b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go @@ -14,7 +14,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func TestAccAzureRMMaintenanceAssignment_vmBasic(t *testing.T) { +func TestAccAzureRMMaintenanceAssignment_basicVM(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") resource.ParallelTest(t, resource.TestCase{ @@ -23,15 +23,13 @@ func TestAccAzureRMMaintenanceAssignment_vmBasic(t *testing.T) { CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignment_vmTemplate(data), - Check: resource.ComposeTestCheckFunc(), }, { // It may take a few minutes after starting a VM for it to become available to assign to a configuration // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(3 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_vmBasic(data), + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_basicVM(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), ), @@ -42,7 +40,7 @@ func TestAccAzureRMMaintenanceAssignment_vmBasic(t *testing.T) { }) } -func TestAccAzureRMMaintenanceAssignment_vmRequiresImport(t *testing.T) { +func TestAccAzureRMMaintenanceAssignment_requiresImportVM(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") resource.ParallelTest(t, resource.TestCase{ @@ -51,25 +49,23 @@ func TestAccAzureRMMaintenanceAssignment_vmRequiresImport(t *testing.T) { CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignment_vmTemplate(data), - Check: resource.ComposeTestCheckFunc(), }, { // It may take a few minutes after starting a VM for it to become available to assign to a configuration // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(3 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_vmBasic(data), + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_basicVM(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), ), }, - data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_vmRequiresImport), + data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_requiresImportVM), }, }) } -func TestAccAzureRMMaintenanceAssignment_dedicatedHostBasic(t *testing.T) { +func TestAccAzureRMMaintenanceAssignment_basicDedicatedHost(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") resource.Test(t, resource.TestCase{ @@ -78,15 +74,13 @@ func TestAccAzureRMMaintenanceAssignment_dedicatedHostBasic(t *testing.T) { CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data), - Check: resource.ComposeTestCheckFunc(), }, { // It may take a few minutes after starting a VM for it to become available to assign to a configuration // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(3 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data), + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), ), @@ -96,7 +90,7 @@ func TestAccAzureRMMaintenanceAssignment_dedicatedHostBasic(t *testing.T) { }) } -func TestAccAzureRMMaintenanceAssignment_dedicatedHostRequiresImport(t *testing.T) { +func TestAccAzureRMMaintenanceAssignment_requiresImportDedicatedHost(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") resource.Test(t, resource.TestCase{ @@ -105,20 +99,18 @@ func TestAccAzureRMMaintenanceAssignment_dedicatedHostRequiresImport(t *testing. CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data), - Check: resource.ComposeTestCheckFunc(), }, { // It may take a few minutes after starting a VM for it to become available to assign to a configuration // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(3 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data), + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), ), }, - data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_dedicatedHostRequiresImport), + data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_requiresImportDedicatedHost), }, }) } @@ -151,7 +143,7 @@ func testCheckAzureRMMaintenanceAssignmentDestroy(s *terraform.State) error { return nil } if listResp.Value != nil && len(*listResp.Value) > 0 { - return fmt.Errorf("maintenance assignment to resource %q still exists", id.ResourceId) + return fmt.Errorf("maintenance assignment (target resource id: %q) still exists", id.ResourceId) } return nil @@ -187,14 +179,14 @@ func testCheckAzureRMMaintenanceAssignmentExists(resourceName string) resource.T return fmt.Errorf("bad: list on ConfigurationAssignmentsClient: %+v", err) } if listResp.Value == nil || len(*listResp.Value) == 0 { - return fmt.Errorf("could not find Maintenance Assignment to resource %q", id.ResourceId) + return fmt.Errorf("could not find Maintenance Assignment (target resource id: %q)", id.ResourceId) } return nil } } -func testAccAzureRMMaintenanceAssignment_vmBasic(data acceptance.TestData) string { +func testAccAzureRMMaintenanceAssignment_basicVM(data acceptance.TestData) string { template := testAccAzureRMMaintenanceAssignment_vmTemplate(data) return fmt.Sprintf(` %s @@ -207,8 +199,8 @@ resource "azurerm_maintenance_assignment" "test" { `, template) } -func testAccAzureRMMaintenanceAssignment_vmRequiresImport(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_vmBasic(data) +func testAccAzureRMMaintenanceAssignment_requiresImportVM(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_basicVM(data) return fmt.Sprintf(` %s @@ -220,7 +212,7 @@ resource "azurerm_maintenance_assignment" "import" { `, template) } -func testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data acceptance.TestData) string { +func testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data acceptance.TestData) string { template := testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data) return fmt.Sprintf(` %s @@ -233,8 +225,8 @@ resource "azurerm_maintenance_assignment" "test" { `, template) } -func testAccAzureRMMaintenanceAssignment_dedicatedHostRequiresImport(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_dedicatedHostBasic(data) +func testAccAzureRMMaintenanceAssignment_requiresImportDedicatedHost(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data) return fmt.Sprintf(` %s From d34abc55edb894ae575b9d20c17263d0c048ce3b Mon Sep 17 00:00:00 2001 From: njucz Date: Thu, 30 Apr 2020 17:17:09 +0800 Subject: [PATCH 3/6] update parse function --- .../parse/maintenance_assignment.go | 75 ++++++++++++------- .../parse/maintenance_assignment_test.go | 43 ++++------- .../resource_arm_maintenance_assignment.go | 74 ++++++++++-------- ...esource_arm_maintenance_assignment_test.go | 23 +++--- 4 files changed, 117 insertions(+), 98 deletions(-) diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment.go index 48adfc0d9de4..9025038228d5 100644 --- a/azurerm/internal/services/maintenance/parse/maintenance_assignment.go +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment.go @@ -9,9 +9,8 @@ import ( ) type MaintenanceAssignmentId struct { - *TargetResourceId - ResourceId string - Name string + TargetResourceId + Name string } func MaintenanceAssignmentID(input string) (*MaintenanceAssignmentId, error) { @@ -20,7 +19,7 @@ func MaintenanceAssignmentID(input string) (*MaintenanceAssignmentId, error) { // 2: /subscriptions//resourcegroups//providers//////providers/Microsoft.Maintenance/configurationAssignments/ groups := regexp.MustCompile(`^(.+)/providers/Microsoft\.Maintenance/configurationAssignments/([^/]+)$`).FindStringSubmatch(input) if len(groups) != 3 { - return nil, fmt.Errorf("parsing Maintenance Assignment ID: %q", input) + return nil, fmt.Errorf("parsing Maintenance Assignment ID: %q: Expected 3 groups", input) } targetResourceId, name := groups[1], groups[2] @@ -31,13 +30,28 @@ func MaintenanceAssignmentID(input string) (*MaintenanceAssignmentId, error) { return &MaintenanceAssignmentId{ TargetResourceId: id, - ResourceId: targetResourceId, Name: name, }, nil } -type TargetResourceId struct { - HasParentResource bool +type TargetResourceId interface { + ID() string +} + +type ScopeResource struct { + id string + ResourceGroup string + ResourceProvider string + ResourceType string + ResourceName string +} + +func (r ScopeResource) ID() string { + return r.id +} + +type ScopeInResource struct { + id string ResourceGroup string ResourceProvider string ResourceParentType string @@ -46,7 +60,11 @@ type TargetResourceId struct { ResourceName string } -func TargetResourceID(input string) (*TargetResourceId, error) { +func (r ScopeInResource) ID() string { + return r.id +} + +func TargetResourceID(input string) (TargetResourceId, error) { // two types of ID: // 1: /subscriptions//resourcegroups//providers/// // 2: /subscriptions//resourcegroups//providers///// @@ -56,41 +74,40 @@ func TargetResourceID(input string) (*TargetResourceId, error) { return nil, fmt.Errorf("parsing target resource id %q: %+v", input, err) } - var resourceParentType, resourceParentName, resourceType, resourceName string - var hasParentResource bool if len(id.Path) != 1 && len(id.Path) != 2 { return nil, fmt.Errorf("parsing target resource id %q", input) } if len(id.Path) == 1 { + var resourceType, resourceName string // assume there is only one left key value pair for k, v := range id.Path { resourceType = k resourceName = v } - } else { - hasParentResource = true - - input = strings.TrimPrefix(input, "/") - input = strings.TrimSuffix(input, "/") - groups := regexp.MustCompile(`^subscriptions/.+/resource[gG]roups/.+/providers/.+/(.+)/(.+)/(.+)/(.+)$`).FindStringSubmatch(input) - if len(groups) != 5 { - return nil, fmt.Errorf("parsing target resource id: %q", input) - } + return ScopeResource{ + id: input, + ResourceGroup: id.ResourceGroup, + ResourceProvider: id.Provider, + ResourceType: resourceType, + ResourceName: resourceName, + }, nil + } - resourceParentType = groups[1] - resourceParentName = groups[2] - resourceType = groups[3] - resourceName = groups[4] + resourceId := strings.TrimPrefix(input, "/") + resourceId = strings.TrimSuffix(resourceId, "/") + groups := regexp.MustCompile(`^subscriptions/.+/resource[gG]roups/.+/providers/.+/(.+)/(.+)/(.+)/(.+)$`).FindStringSubmatch(resourceId) + if len(groups) != 5 { + return nil, fmt.Errorf("parsing target resource id: %q", resourceId) } - return &TargetResourceId{ + return ScopeInResource{ + id: input, ResourceGroup: id.ResourceGroup, ResourceProvider: id.Provider, - ResourceParentType: resourceParentType, - ResourceParentName: resourceParentName, - ResourceType: resourceType, - ResourceName: resourceName, - HasParentResource: hasParentResource, + ResourceParentType: groups[1], + ResourceParentName: groups[2], + ResourceType: groups[3], + ResourceName: groups[4], }, nil } diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go index 7b535afa6ca3..2df488044b43 100644 --- a/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go @@ -1,6 +1,7 @@ package parse import ( + "reflect" "testing" ) @@ -51,15 +52,14 @@ func TestMaintenanceAssignmentID(t *testing.T) { Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/assign1", Error: false, Expect: &MaintenanceAssignmentId{ - TargetResourceId: &TargetResourceId{ - HasParentResource: false, - ResourceGroup: "resGroup1", - ResourceProvider: "microsoft.compute", - ResourceType: "virtualmachines", - ResourceName: "vm1", + TargetResourceId: ScopeResource{ + id: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1", + ResourceGroup: "resGroup1", + ResourceProvider: "microsoft.compute", + ResourceType: "virtualmachines", + ResourceName: "vm1", }, - ResourceId: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1", - Name: "assign1", + Name: "assign1", }, }, { @@ -67,8 +67,8 @@ func TestMaintenanceAssignmentID(t *testing.T) { Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/configurationAssignments/assign1", Error: false, Expect: &MaintenanceAssignmentId{ - TargetResourceId: &TargetResourceId{ - HasParentResource: true, + TargetResourceId: ScopeInResource{ + id: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1", ResourceGroup: "resGroup1", ResourceProvider: "microsoft.compute", ResourceParentType: "hostGroups", @@ -76,8 +76,7 @@ func TestMaintenanceAssignmentID(t *testing.T) { ResourceType: "hosts", ResourceName: "host1", }, - ResourceId: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/hostGroups/group1/hosts/host1", - Name: "assign1", + Name: "assign1", }, }, { @@ -98,24 +97,12 @@ func TestMaintenanceAssignmentID(t *testing.T) { t.Fatalf("Expected a value but got an error: %s", err) } - if actual.ResourceGroup != v.Expect.ResourceGroup { - t.Fatalf("Expected %q but got %q for ResourceGroup", v.Expect.ResourceGroup, actual.ResourceGroup) - } - - if actual.ResourceProvider != v.Expect.ResourceProvider { - t.Fatalf("Expected %q but got %q for ResourceProvider", v.Expect.ResourceProvider, actual.ResourceProvider) - } - - if actual.ResourceType != v.Expect.ResourceType { - t.Fatalf("Expected %q but got %q for ResourceType", v.Expect.ResourceType, actual.ResourceType) - } - - if actual.ResourceName != v.Expect.ResourceName { - t.Fatalf("Expected %q but got %q for ResourceName", v.Expect.ResourceName, actual.ResourceName) - } - if actual.Name != v.Expect.Name { t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) } + + if !reflect.DeepEqual(v.Expect.TargetResourceId, actual.TargetResourceId) { + t.Fatalf("Expected %+v but got %+v", v.Expect.TargetResourceId, actual.TargetResourceId) + } } } diff --git a/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go b/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go index b0a340bb9e9c..cd11b758a033 100644 --- a/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go +++ b/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go @@ -68,10 +68,9 @@ func resourceArmMaintenanceAssignmentCreate(d *schema.ResourceData, meta interfa ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() - targetResourceId := d.Get("target_resource_id").(string) - id, _ := parse.TargetResourceID(targetResourceId) + id, _ := parse.TargetResourceID(d.Get("target_resource_id").(string)) - existing, err := getMaintenanceAssignment(ctx, client, id, targetResourceId) + existing, err := getMaintenanceAssignment(ctx, client, id) if err != nil { return err } @@ -89,20 +88,20 @@ func resourceArmMaintenanceAssignmentCreate(d *schema.ResourceData, meta interfa Location: utils.String(location.Normalize(d.Get("location").(string))), ConfigurationAssignmentProperties: &maintenance.ConfigurationAssignmentProperties{ MaintenanceConfigurationID: utils.String(maintenanceConfigurationID), - ResourceID: utils.String(targetResourceId), + ResourceID: utils.String(id.ID()), }, } if _, err := createMaintenanceAssignment(ctx, client, id, assignmentName, &assignment); err != nil { - return fmt.Errorf("creating Maintenance Assignment (target resource id: %q): %+v", targetResourceId, err) + return fmt.Errorf("creating Maintenance Assignment (target resource id: %q): %+v", id.ID(), err) } - resp, err := getMaintenanceAssignment(ctx, client, id, targetResourceId) + resp, err := getMaintenanceAssignment(ctx, client, id) if err != nil { return err } if resp.ID == nil || *resp.ID == "" { - return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id %q)", targetResourceId) + return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id %q)", id.ID()) } d.SetId(*resp.ID) @@ -119,16 +118,16 @@ func resourceArmMaintenanceAssignmentRead(d *schema.ResourceData, meta interface return err } - assignment, err := getMaintenanceAssignment(ctx, client, id.TargetResourceId, id.ResourceId) + assignment, err := getMaintenanceAssignment(ctx, client, id.TargetResourceId) if err != nil { return err } if assignment.ID == nil || *assignment.ID == "" { - return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id: %q", id.ResourceId) + return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id: %q", id.TargetResourceId.ID()) } // in list api, `ResourceID` returned is always nil - d.Set("target_resource_id", id.ResourceId) + d.Set("target_resource_id", id.TargetResourceId.ID()) if props := assignment.ConfigurationAssignmentProperties; props != nil { d.Set("maintenance_configuration_id", props.MaintenanceConfigurationID) } @@ -146,45 +145,60 @@ func resourceArmMaintenanceAssignmentDelete(d *schema.ResourceData, meta interfa } if _, err := deleteMaintenanceAssignment(ctx, client, id); err != nil { - return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.ResourceId, err) + return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.TargetResourceId.ID(), err) } return nil } -func getMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.TargetResourceId, targetResourceId string) (maintenance.ConfigurationAssignment, error) { +func getMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id parse.TargetResourceId) (result maintenance.ConfigurationAssignment, err error) { var listResp maintenance.ListConfigurationAssignmentsResult - var err error - if id.HasParentResource { - listResp, err = client.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) - } else { - listResp, err = client.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) + + switch v := id.(type) { + case parse.ScopeResource: + listResp, err = client.List(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName) + case parse.ScopeInResource: + listResp, err = client.ListParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName) + default: + err = fmt.Errorf("wrong type of target resource id: %+v", id) + return } + if err != nil { if !utils.ResponseWasNotFound(listResp.Response) { - return maintenance.ConfigurationAssignment{}, fmt.Errorf("checking for presence of existing Maintenance assignment (target resource id %q): %+v", targetResourceId, err) + err = fmt.Errorf("checking for presence of existing Maintenance assignment (target resource id %q): %+v", id.ID(), err) + return } - return maintenance.ConfigurationAssignment{}, nil + return result, nil } if listResp.Value == nil || len(*listResp.Value) == 0 { - return maintenance.ConfigurationAssignment{}, fmt.Errorf("could not find Maintenance assignment (target resource id %q)", targetResourceId) + err = fmt.Errorf("could not find Maintenance assignment (target resource id %q)", id.ID()) + return } return (*listResp.Value)[0], nil } -func createMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.TargetResourceId, assignmentName string, assignment *maintenance.ConfigurationAssignment) (maintenance.ConfigurationAssignment, error) { - if id.HasParentResource { - return client.CreateOrUpdateParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, assignmentName, *assignment) - } else { - return client.CreateOrUpdate(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, assignmentName, *assignment) +func createMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id parse.TargetResourceId, assignmentName string, assignment *maintenance.ConfigurationAssignment) (result maintenance.ConfigurationAssignment, err error) { + switch v := id.(type) { + case parse.ScopeResource: + return client.CreateOrUpdate(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName, assignmentName, *assignment) + case parse.ScopeInResource: + return client.CreateOrUpdateParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName, assignmentName, *assignment) + default: + err = fmt.Errorf("wrong type of target resource id: %+v", id) + return } } -func deleteMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.MaintenanceAssignmentId) (maintenance.ConfigurationAssignment, error) { - if id.HasParentResource { - return client.DeleteParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName, id.Name) - } else { - return client.Delete(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName, id.Name) +func deleteMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.MaintenanceAssignmentId) (result maintenance.ConfigurationAssignment, err error) { + switch v := id.TargetResourceId.(type) { + case parse.ScopeResource: + return client.Delete(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName, id.Name) + case parse.ScopeInResource: + return client.DeleteParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName, id.Name) + default: + err = fmt.Errorf("wrong type of target resource id: %+v", id) + return } } diff --git a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go index fa9c93d4749d..064c93a8305c 100644 --- a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go +++ b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go @@ -130,12 +130,12 @@ func testCheckAzureRMMaintenanceAssignmentDestroy(s *terraform.State) error { } var listResp maintenance.ListConfigurationAssignmentsResult - if id.HasParentResource { - listResp, err = conn.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) - } else { - listResp, err = conn.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) + switch v := id.TargetResourceId.(type) { + case parse.ScopeResource: + listResp, err = conn.List(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName) + case parse.ScopeInResource: + listResp, err = conn.ListParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName) } - if err != nil { if !utils.ResponseWasNotFound(listResp.Response) { return err @@ -143,7 +143,7 @@ func testCheckAzureRMMaintenanceAssignmentDestroy(s *terraform.State) error { return nil } if listResp.Value != nil && len(*listResp.Value) > 0 { - return fmt.Errorf("maintenance assignment (target resource id: %q) still exists", id.ResourceId) + return fmt.Errorf("maintenance assignment (target resource id: %q) still exists", id.TargetResourceId.ID()) } return nil @@ -169,17 +169,18 @@ func testCheckAzureRMMaintenanceAssignmentExists(resourceName string) resource.T } var listResp maintenance.ListConfigurationAssignmentsResult - if id.HasParentResource { - listResp, err = conn.ListParent(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceParentType, id.ResourceParentName, id.ResourceType, id.ResourceName) - } else { - listResp, err = conn.List(ctx, id.ResourceGroup, id.ResourceProvider, id.ResourceType, id.ResourceName) + switch v := id.TargetResourceId.(type) { + case parse.ScopeResource: + listResp, err = conn.List(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName) + case parse.ScopeInResource: + listResp, err = conn.ListParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName) } if err != nil { return fmt.Errorf("bad: list on ConfigurationAssignmentsClient: %+v", err) } if listResp.Value == nil || len(*listResp.Value) == 0 { - return fmt.Errorf("could not find Maintenance Assignment (target resource id: %q)", id.ResourceId) + return fmt.Errorf("could not find Maintenance Assignment (target resource id: %q)", id.TargetResourceId.ID()) } return nil From 2522b35a8bc2d1cf76071be8219fb3a59f7caf9c Mon Sep 17 00:00:00 2001 From: njucz Date: Mon, 15 Jun 2020 17:20:11 +0800 Subject: [PATCH 4/6] split into two different resources --- ...ance_assignment_dedicated_host_resource.go | 169 +++++++++ ...nce_assignment_virtual_machine_resource.go | 169 +++++++++ .../parse/maintenance_assignment.go | 113 ------ .../maintenance_assignment_dedicated_host.go | 33 ++ ...ntenance_assignment_dedicated_host_test.go | 96 +++++ .../maintenance_assignment_virtual_machine.go | 33 ++ ...enance_assignment_virtual_machine_test.go} | 55 ++- .../services/maintenance/registration.go | 5 +- .../resource_arm_maintenance_assignment.go | 204 ----------- ...assignment_dedicated_host_resource_test.go | 184 ++++++++++ ...ssignment_virtual_machine_resource_test.go | 223 ++++++++++++ ...esource_arm_maintenance_assignment_test.go | 342 ------------------ website/azurerm.erb | 6 +- ...ce_assignment_dedicated_host.html.markdown | 84 +++++ ..._assignment_virtual_machine.html.markdown} | 14 +- 15 files changed, 1027 insertions(+), 703 deletions(-) create mode 100644 azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go create mode 100644 azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go delete mode 100644 azurerm/internal/services/maintenance/parse/maintenance_assignment.go create mode 100644 azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go create mode 100644 azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host_test.go create mode 100644 azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go rename azurerm/internal/services/maintenance/parse/{maintenance_assignment_test.go => maintenance_assignment_virtual_machine_test.go} (53%) delete mode 100644 azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go create mode 100644 azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go create mode 100644 azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go delete mode 100644 azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go create mode 100644 website/docs/r/maintenance_assignment_dedicated_host.html.markdown rename website/docs/r/{maintenance_assignment.html.markdown => maintenance_assignment_virtual_machine.html.markdown} (82%) diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go new file mode 100644 index 000000000000..3ebb9177ac1b --- /dev/null +++ b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go @@ -0,0 +1,169 @@ +package maintenance + +import ( + "context" + "fmt" + "time" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + + "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location" + parseCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/parse" + validateCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/validate" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmMaintenanceAssignmentDedicatedHost() *schema.Resource { + return &schema.Resource{ + Create: resourceArmMaintenanceAssignmentDedicatedHostCreate, + Read: resourceArmMaintenanceAssignmentDedicatedHostRead, + Update: nil, + Delete: resourceArmMaintenanceAssignmentDedicatedHostDelete, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.MaintenanceAssignmentDedicatedHostID(id) + return err + }), + + Schema: map[string]*schema.Schema{ + "location": azure.SchemaLocation(), + + "maintenance_configuration_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.MaintenanceConfigurationID, + }, + + "dedicated_host_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateCompute.DedicatedHostID, + DiffSuppressFunc: suppress.CaseDifference, + }, + }, + } +} + +func resourceArmMaintenanceAssignmentDedicatedHostCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + dedicatedHostIdRaw := d.Get("dedicated_host_id").(string) + dedicatedHostId, _ := parseCompute.DedicatedHostID(dedicatedHostIdRaw) + + existing, err := getMaintenanceAssignmentDedicatedHost(ctx, client, dedicatedHostId, dedicatedHostIdRaw) + if err != nil { + return err + } + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_maintenance_assignment_dedicated_host", *existing.ID) + } + + maintenanceConfigurationID := d.Get("maintenance_configuration_id").(string) + configurationId, _ := parse.MaintenanceConfigurationID(maintenanceConfigurationID) + + // set assignment name to configuration name + assignmentName := configurationId.Name + assignment := maintenance.ConfigurationAssignment{ + Name: utils.String(assignmentName), + Location: utils.String(location.Normalize(d.Get("location").(string))), + ConfigurationAssignmentProperties: &maintenance.ConfigurationAssignmentProperties{ + MaintenanceConfigurationID: utils.String(maintenanceConfigurationID), + ResourceID: utils.String(dedicatedHostIdRaw), + }, + } + + if _, err := client.CreateOrUpdateParent(ctx, dedicatedHostId.ResourceGroup, "Microsoft.Compute", "hostGroups", dedicatedHostId.HostGroup, "hosts", dedicatedHostId.Name, assignmentName, assignment); err != nil { + return fmt.Errorf("creating Maintenance Assignment (Dedicated Host ID: %q): %+v", dedicatedHostIdRaw, err) + } + + resp, err := getMaintenanceAssignmentDedicatedHost(ctx, client, dedicatedHostId, dedicatedHostIdRaw) + if err != nil { + return err + } + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("empty or nil ID of Maintenance Assignment (Dedicated Host ID %q)", dedicatedHostIdRaw) + } + + d.SetId(*resp.ID) + return resourceArmMaintenanceAssignmentDedicatedHostRead(d, meta) +} + +func resourceArmMaintenanceAssignmentDedicatedHostRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.MaintenanceAssignmentDedicatedHostID(d.Id()) + if err != nil { + return err + } + + assignment, err := getMaintenanceAssignmentDedicatedHost(ctx, client, id.DedicatedHostId, id.DedicatedHostIdRaw) + if err != nil { + return err + } + if assignment.ID == nil || *assignment.ID == "" { + return fmt.Errorf("empty or nil ID of Maintenance Assignment (Dedicated Host ID: %q", id.DedicatedHostIdRaw) + } + + // in list api, `ResourceID` returned is always nil + d.Set("dedicated_host_id", id.DedicatedHostIdRaw) + if props := assignment.ConfigurationAssignmentProperties; props != nil { + d.Set("maintenance_configuration_id", props.MaintenanceConfigurationID) + } + return nil +} + +func resourceArmMaintenanceAssignmentDedicatedHostDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.MaintenanceAssignmentDedicatedHostID(d.Id()) + if err != nil { + return err + } + + if _, err := client.DeleteParent(ctx, id.DedicatedHostId.ResourceGroup, "Microsoft.Compute", "hostGroups", id.DedicatedHostId.HostGroup, "hosts", id.DedicatedHostId.Name, id.Name); err != nil { + return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.DedicatedHostIdRaw, err) + } + + return nil +} + +func getMaintenanceAssignmentDedicatedHost(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parseCompute.DedicatedHostId, dedicatedHostId string) (result maintenance.ConfigurationAssignment, err error) { + resp, err := client.ListParent(ctx, id.ResourceGroup, "Microsoft.Compute", "hostGroups", id.HostGroup, "hosts", id.Name) + + if err != nil { + if !utils.ResponseWasNotFound(resp.Response) { + err = fmt.Errorf("checking for presence of existing Maintenance assignment (Dedicated Host ID %q): %+v", dedicatedHostId, err) + return + } + return result, nil + } + if resp.Value == nil || len(*resp.Value) == 0 { + err = fmt.Errorf("could not find Maintenance assignment (Dedicated Host ID %q)", dedicatedHostId) + return + } + + return (*resp.Value)[0], nil +} diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go new file mode 100644 index 000000000000..b06d1ba40b2f --- /dev/null +++ b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go @@ -0,0 +1,169 @@ +package maintenance + +import ( + "context" + "fmt" + "time" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + + "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location" + parseCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/parse" + validateCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/validate" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmMaintenanceAssignmentVirtualMachine() *schema.Resource { + return &schema.Resource{ + Create: resourceArmMaintenanceAssignmentVirtualMachineCreate, + Read: resourceArmMaintenanceAssignmentVirtualMachineRead, + Update: nil, + Delete: resourceArmMaintenanceAssignmentVirtualMachineDelete, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.MaintenanceAssignmentVirtualMachineID(id) + return err + }), + + Schema: map[string]*schema.Schema{ + "location": azure.SchemaLocation(), + + "maintenance_configuration_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.MaintenanceConfigurationID, + }, + + "virtual_machine_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateCompute.VirtualMachineID, + DiffSuppressFunc: suppress.CaseDifference, + }, + }, + } +} + +func resourceArmMaintenanceAssignmentVirtualMachineCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + virtualMachineIdRaw := d.Get("virtual_machine_id").(string) + virtualMachineId, _ := parseCompute.VirtualMachineID(virtualMachineIdRaw) + + existing, err := getMaintenanceAssignmentVirtualMachine(ctx, client, virtualMachineId, virtualMachineIdRaw) + if err != nil { + return err + } + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_maintenance_assignment_virtual_machine", *existing.ID) + } + + maintenanceConfigurationID := d.Get("maintenance_configuration_id").(string) + configurationId, _ := parse.MaintenanceConfigurationID(maintenanceConfigurationID) + + // set assignment name to configuration name + assignmentName := configurationId.Name + assignment := maintenance.ConfigurationAssignment{ + Name: utils.String(assignmentName), + Location: utils.String(location.Normalize(d.Get("location").(string))), + ConfigurationAssignmentProperties: &maintenance.ConfigurationAssignmentProperties{ + MaintenanceConfigurationID: utils.String(maintenanceConfigurationID), + ResourceID: utils.String(virtualMachineIdRaw), + }, + } + + if _, err := client.CreateOrUpdate(ctx, virtualMachineId.ResourceGroup, "Microsoft.Compute", "virtualMachines", virtualMachineId.Name, assignmentName, assignment); err != nil { + return fmt.Errorf("creating Maintenance Assignment (virtual machine ID: %q): %+v", virtualMachineIdRaw, err) + } + + resp, err := getMaintenanceAssignmentVirtualMachine(ctx, client, virtualMachineId, virtualMachineIdRaw) + if err != nil { + return err + } + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("empty or nil ID of Maintenance Assignment (virtual machine ID %q)", virtualMachineIdRaw) + } + + d.SetId(*resp.ID) + return resourceArmMaintenanceAssignmentVirtualMachineRead(d, meta) +} + +func resourceArmMaintenanceAssignmentVirtualMachineRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.MaintenanceAssignmentVirtualMachineID(d.Id()) + if err != nil { + return err + } + + assignment, err := getMaintenanceAssignmentVirtualMachine(ctx, client, id.VirtualMachineId, id.VirtualMachineIdRaw) + if err != nil { + return err + } + if assignment.ID == nil || *assignment.ID == "" { + return fmt.Errorf("empty or nil ID of Maintenance Assignment (virtual machine ID id: %q", id.VirtualMachineIdRaw) + } + + // in list api, `ResourceID` returned is always nil + d.Set("virtual_machine_id", id.VirtualMachineIdRaw) + if props := assignment.ConfigurationAssignmentProperties; props != nil { + d.Set("maintenance_configuration_id", props.MaintenanceConfigurationID) + } + return nil +} + +func resourceArmMaintenanceAssignmentVirtualMachineDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.MaintenanceAssignmentVirtualMachineID(d.Id()) + if err != nil { + return err + } + + if _, err := client.Delete(ctx, id.VirtualMachineId.ResourceGroup, "Microsoft.Compute", "virtualMachines", id.VirtualMachineId.Name, id.Name); err != nil { + return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.VirtualMachineIdRaw, err) + } + + return nil +} + +func getMaintenanceAssignmentVirtualMachine(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parseCompute.VirtualMachineId, virtualMachineId string) (result maintenance.ConfigurationAssignment, err error) { + resp, err := client.List(ctx, id.ResourceGroup, "Microsoft.Compute", "virtualMachines", id.Name) + + if err != nil { + if !utils.ResponseWasNotFound(resp.Response) { + err = fmt.Errorf("checking for presence of existing Maintenance assignment (virtual machine ID: %q): %+v", virtualMachineId, err) + return + } + return result, nil + } + if resp.Value == nil || len(*resp.Value) == 0 { + err = fmt.Errorf("could not find Maintenance assignment (virtual machine ID: %q)", virtualMachineId) + return + } + + return (*resp.Value)[0], nil +} diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment.go deleted file mode 100644 index 9025038228d5..000000000000 --- a/azurerm/internal/services/maintenance/parse/maintenance_assignment.go +++ /dev/null @@ -1,113 +0,0 @@ -package parse - -import ( - "fmt" - "regexp" - "strings" - - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" -) - -type MaintenanceAssignmentId struct { - TargetResourceId - Name string -} - -func MaintenanceAssignmentID(input string) (*MaintenanceAssignmentId, error) { - // two types of ID: - // 1: /subscriptions//resourcegroups//providers/microsoft.compute/virtualmachines//providers/Microsoft.Maintenance/configurationAssignments/ - // 2: /subscriptions//resourcegroups//providers//////providers/Microsoft.Maintenance/configurationAssignments/ - groups := regexp.MustCompile(`^(.+)/providers/Microsoft\.Maintenance/configurationAssignments/([^/]+)$`).FindStringSubmatch(input) - if len(groups) != 3 { - return nil, fmt.Errorf("parsing Maintenance Assignment ID: %q: Expected 3 groups", input) - } - - targetResourceId, name := groups[1], groups[2] - id, err := TargetResourceID(targetResourceId) - if err != nil { - return nil, err - } - - return &MaintenanceAssignmentId{ - TargetResourceId: id, - Name: name, - }, nil -} - -type TargetResourceId interface { - ID() string -} - -type ScopeResource struct { - id string - ResourceGroup string - ResourceProvider string - ResourceType string - ResourceName string -} - -func (r ScopeResource) ID() string { - return r.id -} - -type ScopeInResource struct { - id string - ResourceGroup string - ResourceProvider string - ResourceParentType string - ResourceParentName string - ResourceType string - ResourceName string -} - -func (r ScopeInResource) ID() string { - return r.id -} - -func TargetResourceID(input string) (TargetResourceId, error) { - // two types of ID: - // 1: /subscriptions//resourcegroups//providers/// - // 2: /subscriptions//resourcegroups//providers///// - - id, err := azure.ParseAzureResourceID(input) - if err != nil { - return nil, fmt.Errorf("parsing target resource id %q: %+v", input, err) - } - - if len(id.Path) != 1 && len(id.Path) != 2 { - return nil, fmt.Errorf("parsing target resource id %q", input) - } - - if len(id.Path) == 1 { - var resourceType, resourceName string - // assume there is only one left key value pair - for k, v := range id.Path { - resourceType = k - resourceName = v - } - return ScopeResource{ - id: input, - ResourceGroup: id.ResourceGroup, - ResourceProvider: id.Provider, - ResourceType: resourceType, - ResourceName: resourceName, - }, nil - } - - resourceId := strings.TrimPrefix(input, "/") - resourceId = strings.TrimSuffix(resourceId, "/") - groups := regexp.MustCompile(`^subscriptions/.+/resource[gG]roups/.+/providers/.+/(.+)/(.+)/(.+)/(.+)$`).FindStringSubmatch(resourceId) - if len(groups) != 5 { - return nil, fmt.Errorf("parsing target resource id: %q", resourceId) - } - - return ScopeInResource{ - id: input, - ResourceGroup: id.ResourceGroup, - ResourceProvider: id.Provider, - ResourceParentType: groups[1], - ResourceParentName: groups[2], - ResourceType: groups[3], - ResourceName: groups[4], - }, nil -} diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go new file mode 100644 index 000000000000..471d621c8c88 --- /dev/null +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + "regexp" + + parseCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/parse" +) + +type MaintenanceAssignmentDedicatedHostId struct { + DedicatedHostId *parseCompute.DedicatedHostId + DedicatedHostIdRaw string + Name string +} + +func MaintenanceAssignmentDedicatedHostID(input string) (*MaintenanceAssignmentDedicatedHostId, error) { + groups := regexp.MustCompile(`^(.+)/providers/Microsoft\.Maintenance/configurationAssignments/([^/]+)$`).FindStringSubmatch(input) + if len(groups) != 3 { + return nil, fmt.Errorf("parsing Maintenance Assignment Dedicated Host ID: %q: Expected 3 groups", input) + } + + targetResourceId, name := groups[1], groups[2] + dedicatedHostID, err := parseCompute.DedicatedHostID(targetResourceId) + if err != nil { + return nil, fmt.Errorf("parsing Maintenance Assignment Dedicated Host ID: %q: Expected valid Dedicated Host ID", input) + } + + return &MaintenanceAssignmentDedicatedHostId{ + DedicatedHostId: dedicatedHostID, + DedicatedHostIdRaw: targetResourceId, + Name: name, + }, nil +} diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host_test.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host_test.go new file mode 100644 index 000000000000..fee1bb78261b --- /dev/null +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host_test.go @@ -0,0 +1,96 @@ +package parse + +import ( + "reflect" + "testing" + + parseCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/parse" +) + +func TestMaintenanceAssignmentDedicatedHostID(t *testing.T) { + testData := []struct { + Name string + Input string + Error bool + Expect *MaintenanceAssignmentDedicatedHostId + }{ + { + Name: "Empty", + Input: "", + Error: true, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Error: true, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Error: true, + }, + { + Name: "No target resource type", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/", + Error: true, + }, + { + Name: "No target resource name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts", + Error: true, + }, + { + Name: "No Maintenance Assignment Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/", + Error: true, + }, + { + Name: "No Maintenance Assignment name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/configurationAssignments/", + Error: true, + }, + { + Name: "ID of Maintenance Assignment to dedicated host", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/configurationAssignments/assign1", + Error: false, + Expect: &MaintenanceAssignmentDedicatedHostId{ + DedicatedHostIdRaw: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1", + DedicatedHostId: &parseCompute.DedicatedHostId{ + ResourceGroup: "resGroup1", + HostGroup: "group1", + Name: "host1", + }, + Name: "assign1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/ConfigurationAssignments/assign1", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q..", v.Name) + + actual, err := MaintenanceAssignmentDedicatedHostID(v.Input) + if err != nil { + if v.Expect == nil { + continue + } + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expect.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) + } + + if actual.DedicatedHostIdRaw != v.Expect.DedicatedHostIdRaw { + t.Fatalf("Expected %q but got %q for DedicatedHostIdRaw", v.Expect.DedicatedHostIdRaw, actual.DedicatedHostIdRaw) + } + + if !reflect.DeepEqual(v.Expect.DedicatedHostId, actual.DedicatedHostId) { + t.Fatalf("Expected %+v but got %+v", v.Expect.DedicatedHostId, actual.DedicatedHostId) + } + } +} diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go new file mode 100644 index 000000000000..326085ad8896 --- /dev/null +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + "regexp" + + parseCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/parse" +) + +type MaintenanceAssignmentVirtualMachineId struct { + VirtualMachineId *parseCompute.VirtualMachineId + VirtualMachineIdRaw string + Name string +} + +func MaintenanceAssignmentVirtualMachineID(input string) (*MaintenanceAssignmentVirtualMachineId, error) { + groups := regexp.MustCompile(`^(.+)/providers/Microsoft\.Maintenance/configurationAssignments/([^/]+)$`).FindStringSubmatch(input) + if len(groups) != 3 { + return nil, fmt.Errorf("parsing Maintenance Assignment Virtual Machine ID: %q: Expected 3 groups", input) + } + + targetResourceId, name := groups[1], groups[2] + virtualMachineId, err := parseCompute.VirtualMachineID(targetResourceId) + if err != nil { + return nil, fmt.Errorf("parsing Maintenance Assignment Virtual Machine ID: %q: Expected valid virtual machine ID", input) + } + + return &MaintenanceAssignmentVirtualMachineId{ + VirtualMachineId: virtualMachineId, + VirtualMachineIdRaw: targetResourceId, + Name: name, + }, nil +} diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine_test.go similarity index 53% rename from azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go rename to azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine_test.go index 2df488044b43..8ec69413caae 100644 --- a/azurerm/internal/services/maintenance/parse/maintenance_assignment_test.go +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine_test.go @@ -3,14 +3,16 @@ package parse import ( "reflect" "testing" + + parseCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/parse" ) -func TestMaintenanceAssignmentID(t *testing.T) { +func TestMaintenanceAssignmentVirtualMachineID(t *testing.T) { testData := []struct { Name string Input string Error bool - Expect *MaintenanceAssignmentId + Expect *MaintenanceAssignmentVirtualMachineId }{ { Name: "Empty", @@ -34,54 +36,35 @@ func TestMaintenanceAssignmentID(t *testing.T) { }, { Name: "No target resource name", - Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualMachines/", Error: true, }, { Name: "No Maintenance Assignment Segment", - Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualMachines/vm1/providers/Microsoft.Maintenance/", Error: true, }, { Name: "No Maintenance Assignment name", - Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualMachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/", Error: true, }, { Name: "ID of Maintenance Assignment to vm", - Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/assign1", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualMachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/assign1", Error: false, - Expect: &MaintenanceAssignmentId{ - TargetResourceId: ScopeResource{ - id: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1", - ResourceGroup: "resGroup1", - ResourceProvider: "microsoft.compute", - ResourceType: "virtualmachines", - ResourceName: "vm1", - }, - Name: "assign1", - }, - }, - { - Name: "ID of Maintenance Assignment to dedicated host", - Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/configurationAssignments/assign1", - Error: false, - Expect: &MaintenanceAssignmentId{ - TargetResourceId: ScopeInResource{ - id: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1", - ResourceGroup: "resGroup1", - ResourceProvider: "microsoft.compute", - ResourceParentType: "hostGroups", - ResourceParentName: "group1", - ResourceType: "hosts", - ResourceName: "host1", + Expect: &MaintenanceAssignmentVirtualMachineId{ + VirtualMachineIdRaw: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualMachines/vm1", + VirtualMachineId: &parseCompute.VirtualMachineId{ + ResourceGroup: "resGroup1", + Name: "vm1", }, Name: "assign1", }, }, { Name: "Wrong Casing", - Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/ConfigurationAssignments/assign1", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualMachines/vm1/providers/Microsoft.Maintenance/ConfigurationAssignments/assign1", Error: true, }, } @@ -89,7 +72,7 @@ func TestMaintenanceAssignmentID(t *testing.T) { for _, v := range testData { t.Logf("[DEBUG] Testing %q..", v.Name) - actual, err := MaintenanceAssignmentID(v.Input) + actual, err := MaintenanceAssignmentVirtualMachineID(v.Input) if err != nil { if v.Expect == nil { continue @@ -101,8 +84,12 @@ func TestMaintenanceAssignmentID(t *testing.T) { t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) } - if !reflect.DeepEqual(v.Expect.TargetResourceId, actual.TargetResourceId) { - t.Fatalf("Expected %+v but got %+v", v.Expect.TargetResourceId, actual.TargetResourceId) + if actual.VirtualMachineIdRaw != v.Expect.VirtualMachineIdRaw { + t.Fatalf("Expected %q but got %q for VirtualMachineIdRaw", v.Expect.VirtualMachineIdRaw, actual.VirtualMachineIdRaw) + } + + if !reflect.DeepEqual(v.Expect.VirtualMachineId, actual.VirtualMachineId) { + t.Fatalf("Expected %+v but got %+v", v.Expect.VirtualMachineId, actual.VirtualMachineId) } } } diff --git a/azurerm/internal/services/maintenance/registration.go b/azurerm/internal/services/maintenance/registration.go index c624ae833766..b703a69a9e51 100644 --- a/azurerm/internal/services/maintenance/registration.go +++ b/azurerm/internal/services/maintenance/registration.go @@ -24,7 +24,8 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_maintenance_assignment": resourceArmMaintenanceAssignment(), - "azurerm_maintenance_configuration": resourceArmMaintenanceConfiguration(), + "azurerm_maintenance_assignment_dedicated_host": resourceArmMaintenanceAssignmentDedicatedHost(), + "azurerm_maintenance_assignment_virtual_machine": resourceArmMaintenanceAssignmentVirtualMachine(), + "azurerm_maintenance_configuration": resourceArmMaintenanceConfiguration(), } } diff --git a/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go b/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go deleted file mode 100644 index cd11b758a033..000000000000 --- a/azurerm/internal/services/maintenance/resource_arm_maintenance_assignment.go +++ /dev/null @@ -1,204 +0,0 @@ -package maintenance - -import ( - "context" - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location" - validateCompute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/validate" - azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmMaintenanceAssignment() *schema.Resource { - return &schema.Resource{ - Create: resourceArmMaintenanceAssignmentCreate, - Read: resourceArmMaintenanceAssignmentRead, - Update: nil, - Delete: resourceArmMaintenanceAssignmentDelete, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { - _, err := parse.MaintenanceAssignmentID(id) - return err - }), - - Schema: map[string]*schema.Schema{ - "location": azure.SchemaLocation(), - - "maintenance_configuration_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validate.MaintenanceConfigurationID, - }, - - "target_resource_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.Any( - validateCompute.DedicatedHostID, - validateCompute.VirtualMachineID, - ), - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - } -} - -func resourceArmMaintenanceAssignmentCreate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, _ := parse.TargetResourceID(d.Get("target_resource_id").(string)) - - existing, err := getMaintenanceAssignment(ctx, client, id) - if err != nil { - return err - } - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_maintenance_assignment", *existing.ID) - } - - maintenanceConfigurationID := d.Get("maintenance_configuration_id").(string) - configurationId, _ := parse.MaintenanceConfigurationID(maintenanceConfigurationID) - - // set assignment name to configuration name - assignmentName := configurationId.Name - assignment := maintenance.ConfigurationAssignment{ - Name: utils.String(assignmentName), - Location: utils.String(location.Normalize(d.Get("location").(string))), - ConfigurationAssignmentProperties: &maintenance.ConfigurationAssignmentProperties{ - MaintenanceConfigurationID: utils.String(maintenanceConfigurationID), - ResourceID: utils.String(id.ID()), - }, - } - - if _, err := createMaintenanceAssignment(ctx, client, id, assignmentName, &assignment); err != nil { - return fmt.Errorf("creating Maintenance Assignment (target resource id: %q): %+v", id.ID(), err) - } - - resp, err := getMaintenanceAssignment(ctx, client, id) - if err != nil { - return err - } - if resp.ID == nil || *resp.ID == "" { - return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id %q)", id.ID()) - } - - d.SetId(*resp.ID) - return resourceArmMaintenanceAssignmentRead(d, meta) -} - -func resourceArmMaintenanceAssignmentRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := parse.MaintenanceAssignmentID(d.Id()) - if err != nil { - return err - } - - assignment, err := getMaintenanceAssignment(ctx, client, id.TargetResourceId) - if err != nil { - return err - } - if assignment.ID == nil || *assignment.ID == "" { - return fmt.Errorf("empty or nil ID of Maintenance Assignment (target resource id: %q", id.TargetResourceId.ID()) - } - - // in list api, `ResourceID` returned is always nil - d.Set("target_resource_id", id.TargetResourceId.ID()) - if props := assignment.ConfigurationAssignmentProperties; props != nil { - d.Set("maintenance_configuration_id", props.MaintenanceConfigurationID) - } - return nil -} - -func resourceArmMaintenanceAssignmentDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Maintenance.ConfigurationAssignmentsClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := parse.MaintenanceAssignmentID(d.Id()) - if err != nil { - return err - } - - if _, err := deleteMaintenanceAssignment(ctx, client, id); err != nil { - return fmt.Errorf("deleting Maintenance Assignment to resource %q: %+v", id.TargetResourceId.ID(), err) - } - - return nil -} - -func getMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id parse.TargetResourceId) (result maintenance.ConfigurationAssignment, err error) { - var listResp maintenance.ListConfigurationAssignmentsResult - - switch v := id.(type) { - case parse.ScopeResource: - listResp, err = client.List(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName) - case parse.ScopeInResource: - listResp, err = client.ListParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName) - default: - err = fmt.Errorf("wrong type of target resource id: %+v", id) - return - } - - if err != nil { - if !utils.ResponseWasNotFound(listResp.Response) { - err = fmt.Errorf("checking for presence of existing Maintenance assignment (target resource id %q): %+v", id.ID(), err) - return - } - return result, nil - } - if listResp.Value == nil || len(*listResp.Value) == 0 { - err = fmt.Errorf("could not find Maintenance assignment (target resource id %q)", id.ID()) - return - } - - return (*listResp.Value)[0], nil -} - -func createMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id parse.TargetResourceId, assignmentName string, assignment *maintenance.ConfigurationAssignment) (result maintenance.ConfigurationAssignment, err error) { - switch v := id.(type) { - case parse.ScopeResource: - return client.CreateOrUpdate(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName, assignmentName, *assignment) - case parse.ScopeInResource: - return client.CreateOrUpdateParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName, assignmentName, *assignment) - default: - err = fmt.Errorf("wrong type of target resource id: %+v", id) - return - } -} - -func deleteMaintenanceAssignment(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parse.MaintenanceAssignmentId) (result maintenance.ConfigurationAssignment, err error) { - switch v := id.TargetResourceId.(type) { - case parse.ScopeResource: - return client.Delete(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName, id.Name) - case parse.ScopeInResource: - return client.DeleteParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName, id.Name) - default: - err = fmt.Errorf("wrong type of target resource id: %+v", id) - return - } -} diff --git a/azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go b/azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go new file mode 100644 index 000000000000..4de7a4f38efc --- /dev/null +++ b/azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go @@ -0,0 +1,184 @@ +package tests + +import ( + "fmt" + "testing" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMMaintenanceAssignmentDedicatedHost_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment_dedicated_host", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentDedicatedHostDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_template(data), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentDedicatedHostExists(data.ResourceName), + ), + }, + data.ImportStep("location"), + }, + }) +} + +func TestAccAzureRMMaintenanceAssignmentDedicatedHost_requiresImport(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment_dedicated_host", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentDedicatedHostDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_template(data), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentDedicatedHostExists(data.ResourceName), + ), + }, + data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignmentDedicatedHost_requiresImport), + }, + }) +} + +func testCheckAzureRMMaintenanceAssignmentDedicatedHostDestroy(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_maintenance_assignment_dedicated_host" { + continue + } + + id, err := parse.MaintenanceAssignmentDedicatedHostID(rs.Primary.ID) + if err != nil { + return err + } + + listResp, err := conn.ListParent(ctx, id.DedicatedHostId.ResourceGroup, "Microsoft.Compute", "hostGroups", id.DedicatedHostId.HostGroup, "hosts", id.DedicatedHostId.Name) + if err != nil { + if !utils.ResponseWasNotFound(listResp.Response) { + return err + } + return nil + } + if listResp.Value != nil && len(*listResp.Value) > 0 { + return fmt.Errorf("maintenance assignment (Dedicated Host ID: %q) still exists", id.DedicatedHostIdRaw) + } + + return nil + } + + return nil +} + +func testCheckAzureRMMaintenanceAssignmentDedicatedHostExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("not found: %s", resourceName) + } + + id, err := parse.MaintenanceAssignmentDedicatedHostID(rs.Primary.ID) + if err != nil { + return err + } + + listResp, err := conn.ListParent(ctx, id.DedicatedHostId.ResourceGroup, "Microsoft.Compute", "hostGroups", id.DedicatedHostId.HostGroup, "hosts", id.DedicatedHostId.Name) + if err != nil { + return fmt.Errorf("bad: list on ConfigurationAssignmentsClient: %+v", err) + } + if listResp.Value == nil || len(*listResp.Value) == 0 { + return fmt.Errorf("could not find Maintenance Assignment (target resource id: %q)", id.DedicatedHostIdRaw) + } + + return nil + } +} + +func testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignmentDedicatedHost_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment_dedicated_host" "test" { + location = azurerm_resource_group.test.location + maintenance_configuration_id = azurerm_maintenance_configuration.test.id + dedicated_host_id = azurerm_dedicated_host.test.id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignmentDedicatedHost_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment_dedicated_host" "import" { + location = azurerm_maintenance_assignment_dedicated_host.test.location + maintenance_configuration_id = azurerm_maintenance_assignment_dedicated_host.test.maintenance_configuration_id + dedicated_host_id = azurerm_maintenance_assignment_dedicated_host.test.dedicated_host_id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignmentDedicatedHost_template(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-maint-%[1]d" + location = "%[2]s" +} + +resource "azurerm_maintenance_configuration" "test" { + name = "acctest-MC%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + scope = "All" +} + +resource "azurerm_dedicated_host_group" "test" { + name = "acctest-DHG-%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + platform_fault_domain_count = 2 +} + +resource "azurerm_dedicated_host" "test" { + name = "acctest-DH-%[1]d" + location = azurerm_resource_group.test.location + dedicated_host_group_id = azurerm_dedicated_host_group.test.id + sku_name = "DSv3-Type1" + platform_fault_domain = 1 +} +`, data.RandomInteger, data.Locations.Primary) +} diff --git a/azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go b/azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go new file mode 100644 index 000000000000..0f1e742064e3 --- /dev/null +++ b/azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go @@ -0,0 +1,223 @@ +package tests + +import ( + "fmt" + "testing" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMMaintenanceAssignmentVirtualMachine_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment_virtual_machine", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_template(data), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentVirtualMachineExists(data.ResourceName), + ), + }, + // location not returned by list rest api + data.ImportStep("location"), + }, + }) +} + +func TestAccAzureRMMaintenanceAssignmentVirtualMachine_requiresImport(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment_virtual_machine", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMaintenanceAssignmentVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_template(data), + }, + { + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + // for newly created machine, wait several minutes + PreConfig: func() { time.Sleep(5 * time.Minute) }, + Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMaintenanceAssignmentVirtualMachineExists(data.ResourceName), + ), + }, + data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignmentVirtualMachine_requiresImport), + }, + }) +} + +func testCheckAzureRMMaintenanceAssignmentVirtualMachineDestroy(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_maintenance_assignment_virtual_machine" { + continue + } + + id, err := parse.MaintenanceAssignmentVirtualMachineID(rs.Primary.ID) + if err != nil { + return err + } + + listResp, err := conn.List(ctx, id.VirtualMachineId.ResourceGroup, "Microsoft.Compute", "virtualMachines", id.VirtualMachineId.Name) + if err != nil { + if !utils.ResponseWasNotFound(listResp.Response) { + return err + } + return nil + } + if listResp.Value != nil && len(*listResp.Value) > 0 { + return fmt.Errorf("maintenance assignment (Virtual Machine id: %q) still exists", id.VirtualMachineIdRaw) + } + + return nil + } + + return nil +} + +func testCheckAzureRMMaintenanceAssignmentVirtualMachineExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("not found: %s", resourceName) + } + + id, err := parse.MaintenanceAssignmentVirtualMachineID(rs.Primary.ID) + if err != nil { + return err + } + + listResp, err := conn.List(ctx, id.VirtualMachineId.ResourceGroup, "Microsoft.Compute", "virtualMachines", id.VirtualMachineId.Name) + if err != nil { + return fmt.Errorf("bad: list on ConfigurationAssignmentsClient: %+v", err) + } + if listResp.Value == nil || len(*listResp.Value) == 0 { + return fmt.Errorf("could not find Maintenance Assignment (Virtual Machine id: %q)", id.VirtualMachineIdRaw) + } + + return nil + } +} + +func testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignmentVirtualMachine_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment_virtual_machine" "test" { + location = azurerm_resource_group.test.location + maintenance_configuration_id = azurerm_maintenance_configuration.test.id + virtual_machine_id = azurerm_linux_virtual_machine.test.id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignmentVirtualMachine_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_maintenance_assignment_virtual_machine" "import" { + location = azurerm_maintenance_assignment_virtual_machine.test.location + maintenance_configuration_id = azurerm_maintenance_assignment_virtual_machine.test.maintenance_configuration_id + virtual_machine_id = azurerm_maintenance_assignment_virtual_machine.test.virtual_machine_id +} +`, template) +} + +func testAccAzureRMMaintenanceAssignmentVirtualMachine_template(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-maint-%[1]d" + location = "%[2]s" +} + +resource "azurerm_maintenance_configuration" "test" { + name = "acctest-MC%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + scope = "All" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestnw-%[1]d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_interface" "test" { + name = "acctni-%[1]d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_linux_virtual_machine" "test" { + name = "acctestVM-%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + size = "Standard_D15_v2" + admin_username = "adminuser" + admin_password = "P@$$w0rd1234!" + + disable_password_authentication = false + + network_interface_ids = [ + azurerm_network_interface.test.id, + ] + + os_disk { + caching = "ReadWrite" + storage_account_type = "Standard_LRS" + } + + source_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04-LTS" + version = "latest" + } +} +`, data.RandomInteger, data.Locations.Primary) +} diff --git a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go deleted file mode 100644 index 064c93a8305c..000000000000 --- a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_assignment_test.go +++ /dev/null @@ -1,342 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func TestAccAzureRMMaintenanceAssignment_basicVM(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMaintenanceAssignment_vmTemplate(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_basicVM(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), - ), - }, - // location not returned by list rest api - data.ImportStep("location"), - }, - }) -} - -func TestAccAzureRMMaintenanceAssignment_requiresImportVM(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMaintenanceAssignment_vmTemplate(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_basicVM(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), - ), - }, - data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_requiresImportVM), - }, - }) -} - -func TestAccAzureRMMaintenanceAssignment_basicDedicatedHost(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), - ), - }, - data.ImportStep("location"), - }, - }) -} - -func TestAccAzureRMMaintenanceAssignment_requiresImportDedicatedHost(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_maintenance_assignment", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMaintenanceAssignmentDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMaintenanceAssignmentExists(data.ResourceName), - ), - }, - data.RequiresImportErrorStep(testAccAzureRMMaintenanceAssignment_requiresImportDedicatedHost), - }, - }) -} - -func testCheckAzureRMMaintenanceAssignmentDestroy(s *terraform.State) error { - conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_maintenance_assignment" { - continue - } - - id, err := parse.MaintenanceAssignmentID(rs.Primary.ID) - if err != nil { - return err - } - - var listResp maintenance.ListConfigurationAssignmentsResult - switch v := id.TargetResourceId.(type) { - case parse.ScopeResource: - listResp, err = conn.List(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName) - case parse.ScopeInResource: - listResp, err = conn.ListParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName) - } - if err != nil { - if !utils.ResponseWasNotFound(listResp.Response) { - return err - } - return nil - } - if listResp.Value != nil && len(*listResp.Value) > 0 { - return fmt.Errorf("maintenance assignment (target resource id: %q) still exists", id.TargetResourceId.ID()) - } - - return nil - } - - return nil -} - -func testCheckAzureRMMaintenanceAssignmentExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - conn := acceptance.AzureProvider.Meta().(*clients.Client).Maintenance.ConfigurationAssignmentsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("not found: %s", resourceName) - } - - id, err := parse.MaintenanceAssignmentID(rs.Primary.ID) - if err != nil { - return err - } - - var listResp maintenance.ListConfigurationAssignmentsResult - switch v := id.TargetResourceId.(type) { - case parse.ScopeResource: - listResp, err = conn.List(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceType, v.ResourceName) - case parse.ScopeInResource: - listResp, err = conn.ListParent(ctx, v.ResourceGroup, v.ResourceProvider, v.ResourceParentType, v.ResourceParentName, v.ResourceType, v.ResourceName) - } - - if err != nil { - return fmt.Errorf("bad: list on ConfigurationAssignmentsClient: %+v", err) - } - if listResp.Value == nil || len(*listResp.Value) == 0 { - return fmt.Errorf("could not find Maintenance Assignment (target resource id: %q)", id.TargetResourceId.ID()) - } - - return nil - } -} - -func testAccAzureRMMaintenanceAssignment_basicVM(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_vmTemplate(data) - return fmt.Sprintf(` -%s - -resource "azurerm_maintenance_assignment" "test" { - location = azurerm_resource_group.test.location - maintenance_configuration_id = azurerm_maintenance_configuration.test.id - target_resource_id = azurerm_linux_virtual_machine.test.id -} -`, template) -} - -func testAccAzureRMMaintenanceAssignment_requiresImportVM(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_basicVM(data) - return fmt.Sprintf(` -%s - -resource "azurerm_maintenance_assignment" "import" { - location = azurerm_maintenance_assignment.test.location - maintenance_configuration_id = azurerm_maintenance_assignment.test.maintenance_configuration_id - target_resource_id = azurerm_maintenance_assignment.test.target_resource_id -} -`, template) -} - -func testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data) - return fmt.Sprintf(` -%s - -resource "azurerm_maintenance_assignment" "test" { - location = azurerm_resource_group.test.location - maintenance_configuration_id = azurerm_maintenance_configuration.test.id - target_resource_id = azurerm_dedicated_host.test.id -} -`, template) -} - -func testAccAzureRMMaintenanceAssignment_requiresImportDedicatedHost(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_basicDedicatedHost(data) - return fmt.Sprintf(` -%s - -resource "azurerm_maintenance_assignment" "import" { - location = azurerm_maintenance_assignment.test.location - maintenance_configuration_id = azurerm_maintenance_assignment.test.maintenance_configuration_id - target_resource_id = azurerm_maintenance_assignment.test.target_resource_id -} -`, template) -} - -func testAccAzureRMMaintenanceAssignment_vmTemplate(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_virtual_network" "test" { - name = "acctestnw-%[2]d" - address_space = ["10.0.0.0/16"] - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name -} - -resource "azurerm_subnet" "test" { - name = "internal" - resource_group_name = azurerm_resource_group.test.name - virtual_network_name = azurerm_virtual_network.test.name - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctni-%[2]d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - - ip_configuration { - name = "testconfiguration1" - subnet_id = azurerm_subnet.test.id - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_linux_virtual_machine" "test" { - name = "acctestVM-%[2]d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - size = "Standard_D15_v2" - admin_username = "adminuser" - admin_password = "P@$$w0rd1234!" - - disable_password_authentication = false - - network_interface_ids = [ - azurerm_network_interface.test.id, - ] - - os_disk { - caching = "ReadWrite" - storage_account_type = "Standard_LRS" - } - - source_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMMaintenanceAssignment_dedicatedHostTemplate(data acceptance.TestData) string { - template := testAccAzureRMMaintenanceAssignment_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_dedicated_host_group" "test" { - name = "acctest-DHG-%[2]d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - platform_fault_domain_count = 2 -} - -resource "azurerm_dedicated_host" "test" { - name = "acctest-DH-%[2]d" - location = azurerm_resource_group.test.location - dedicated_host_group_id = azurerm_dedicated_host_group.test.id - sku_name = "DSv3-Type1" - platform_fault_domain = 1 -} -`, template, data.RandomInteger) -} - -func testAccAzureRMMaintenanceAssignment_template(data acceptance.TestData) string { - return fmt.Sprintf(` -provider "azurerm" { - features {} -} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-maint-%[1]d" - location = "%[2]s" -} - -resource "azurerm_maintenance_configuration" "test" { - name = "acctest-MC%[1]d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - scope = "All" -} -`, data.RandomInteger, data.Locations.Primary) -} diff --git a/website/azurerm.erb b/website/azurerm.erb index 735954aa4cc4..21d367a6950e 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1705,7 +1705,11 @@ Maintenance Resources
      • - azurerm_maintenance_assignment + azurerm_maintenance_assignment_dedicated_host +
        • + +
      • + azurerm_maintenance_assignment_virtual_machine
      • diff --git a/website/docs/r/maintenance_assignment_dedicated_host.html.markdown b/website/docs/r/maintenance_assignment_dedicated_host.html.markdown new file mode 100644 index 000000000000..f0d59a259e32 --- /dev/null +++ b/website/docs/r/maintenance_assignment_dedicated_host.html.markdown @@ -0,0 +1,84 @@ +--- +subcategory: "Maintenance" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_maintenance_assignment_dedicated_host" +description: |- + Manages a Maintenance Assignment to Dedicated Host. +--- + +# azurerm_maintenance_assignment_dedicated_host + +Manages a maintenance assignment to Dedicated Host. + +## Example Usage + +```hcl +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "example" { + name = "example-resources" + location = "West Europe" +} + +resource "azurerm_dedicated_host_group" "example" { + name = "example-host-group" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + platform_fault_domain_count = 2 +} + +resource "azurerm_dedicated_host" "example" { + name = "example-host" + location = azurerm_resource_group.example.location + dedicated_host_group_id = azurerm_dedicated_host_group.example.id + sku_name = "DSv3-Type1" + platform_fault_domain = 1 +} + +resource "azurerm_maintenance_configuration" "example" { + name = "example-mc" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + scope = "All" +} + +resource "azurerm_maintenance_assignment_dedicated_host" "example" { + location = azurerm_resource_group.example.location + maintenance_configuration_id = azurerm_maintenance_configuration.example.id + dedicated_host_id = azurerm_dedicated_host.example.id +} +``` + +## Argument Reference + +The following arguments are supported: + +* `location` - (Required) Specified the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `maintenance_configuration_id` - (Required) Specified the id of Maintenance Configuration Resource. Changing this forces a new resource to be created. + +* `dedicated_host_id` - (Required) Specified the Dedicated Host ID where the Maintenance Configuration will be assigned to. Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the Maintenance Assignment. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 30 minutes) Used when creating the Maintenance Assignment. +* `read` - (Defaults to 5 minutes) Used when retrieving the Maintenance Assignment. +* `delete` - (Defaults to 30 minutes) Used when deleting the Maintenance Assignment. + +## Import + +Maintenance Assignment can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_maintenance_assignment_dedicated_host.example /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/hostGroups/group1/hosts/host1/providers/Microsoft.Maintenance/configurationAssignments/assign1 +``` diff --git a/website/docs/r/maintenance_assignment.html.markdown b/website/docs/r/maintenance_assignment_virtual_machine.html.markdown similarity index 82% rename from website/docs/r/maintenance_assignment.html.markdown rename to website/docs/r/maintenance_assignment_virtual_machine.html.markdown index 82210e2bc2d5..ca739367672c 100644 --- a/website/docs/r/maintenance_assignment.html.markdown +++ b/website/docs/r/maintenance_assignment_virtual_machine.html.markdown @@ -1,14 +1,14 @@ --- subcategory: "Maintenance" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_maintenance_assignment" +page_title: "Azure Resource Manager: azurerm_maintenance_assignment_virtual_machine" description: |- Manages a Maintenance Assignment. --- -# azurerm_maintenance_assignment +# azurerm_maintenance_assignment_virtual_machine -Manages a maintenance assignment. +Manages a maintenance assignment to virtual machine. ## Example Usage @@ -83,10 +83,10 @@ resource "azurerm_maintenance_configuration" "example" { scope = "All" } -resource "azurerm_maintenance_assignment" "example" { +resource "azurerm_maintenance_assignment_virtual_machine" "example" { location = azurerm_resource_group.example.location maintenance_configuration_id = azurerm_maintenance_configuration.example.id - target_resource_id = azurerm_linux_virtual_machine.example.id + virtual_machine_id = azurerm_linux_virtual_machine.example.id } ``` @@ -98,7 +98,7 @@ The following arguments are supported: * `maintenance_configuration_id` - (Required) Specified the id of Maintenance Configuration Resource. Changing this forces a new resource to be created. -* `target_resource_id` - (Required) Specified the target resource id where the Maintenance Configuration will be assigned to. Currently, only `Virtual Machine` and `Dedicated Host` resources are supported. Changing this forces a new resource to be created. +* `virtual_machine_id` - (Required) Specified the Virtual Machine ID where the Maintenance Configuration will be assigned to. Changing this forces a new resource to be created. ## Attributes Reference @@ -119,5 +119,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d Maintenance Assignment can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_maintenance_assignment.example /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualmachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/example-assign +terraform import azurerm_maintenance_assignment_virtual_machine.example /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/resGroup1/providers/microsoft.compute/virtualMachines/vm1/providers/Microsoft.Maintenance/configurationAssignments/assign1 ``` From 41b5b70da0683fffe9d3f545d004d670217a3a4c Mon Sep 17 00:00:00 2001 From: njucz Date: Wed, 17 Jun 2020 19:25:39 +0800 Subject: [PATCH 5/6] add retry and update some documents --- ...ance_assignment_dedicated_host_resource.go | 20 +++++++++++++------ ...nce_assignment_virtual_machine_resource.go | 20 +++++++++++++------ .../maintenance_assignment_dedicated_host.go | 2 +- .../maintenance_assignment_virtual_machine.go | 2 +- ...assignment_dedicated_host_resource_test.go | 17 ++-------------- ...ssignment_virtual_machine_resource_test.go | 17 ++-------------- ...ce_assignment_dedicated_host.html.markdown | 6 +++--- ...e_assignment_virtual_machine.html.markdown | 6 +++--- 8 files changed, 40 insertions(+), 50 deletions(-) diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go index 3ebb9177ac1b..c1dedc63b6eb 100644 --- a/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go +++ b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go @@ -3,13 +3,14 @@ package maintenance import ( "context" "fmt" + "strings" "time" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location" @@ -26,7 +27,6 @@ func resourceArmMaintenanceAssignmentDedicatedHost() *schema.Resource { return &schema.Resource{ Create: resourceArmMaintenanceAssignmentDedicatedHostCreate, Read: resourceArmMaintenanceAssignmentDedicatedHostRead, - Update: nil, Delete: resourceArmMaintenanceAssignmentDedicatedHostDelete, Timeouts: &schema.ResourceTimeout{ @@ -91,9 +91,17 @@ func resourceArmMaintenanceAssignmentDedicatedHostCreate(d *schema.ResourceData, }, } - if _, err := client.CreateOrUpdateParent(ctx, dedicatedHostId.ResourceGroup, "Microsoft.Compute", "hostGroups", dedicatedHostId.HostGroup, "hosts", dedicatedHostId.Name, assignmentName, assignment); err != nil { - return fmt.Errorf("creating Maintenance Assignment (Dedicated Host ID: %q): %+v", dedicatedHostIdRaw, err) - } + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { + if _, err := client.CreateOrUpdateParent(ctx, dedicatedHostId.ResourceGroup, "Microsoft.Compute", "hostGroups", dedicatedHostId.HostGroup, "hosts", dedicatedHostId.Name, assignmentName, assignment); err != nil { + if strings.Contains(err.Error(), "It may take a few minutes after starting a VM for it to become available to assign to a configuration") { + return resource.RetryableError(fmt.Errorf("expected VM is available to assign to a configuration but was in pending state, retrying")) + } + return resource.NonRetryableError(fmt.Errorf("issuing creating request for Maintenance Assignment (Dedicated Host ID %q): %+v", dedicatedHostIdRaw, err)) + } + + return nil + }) resp, err := getMaintenanceAssignmentDedicatedHost(ctx, client, dedicatedHostId, dedicatedHostIdRaw) if err != nil { diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go index b06d1ba40b2f..a4c8cc0d7b54 100644 --- a/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go +++ b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go @@ -3,13 +3,14 @@ package maintenance import ( "context" "fmt" + "strings" "time" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/Azure/azure-sdk-for-go/services/preview/maintenance/mgmt/2018-06-01-preview/maintenance" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location" @@ -26,7 +27,6 @@ func resourceArmMaintenanceAssignmentVirtualMachine() *schema.Resource { return &schema.Resource{ Create: resourceArmMaintenanceAssignmentVirtualMachineCreate, Read: resourceArmMaintenanceAssignmentVirtualMachineRead, - Update: nil, Delete: resourceArmMaintenanceAssignmentVirtualMachineDelete, Timeouts: &schema.ResourceTimeout{ @@ -91,9 +91,17 @@ func resourceArmMaintenanceAssignmentVirtualMachineCreate(d *schema.ResourceData }, } - if _, err := client.CreateOrUpdate(ctx, virtualMachineId.ResourceGroup, "Microsoft.Compute", "virtualMachines", virtualMachineId.Name, assignmentName, assignment); err != nil { - return fmt.Errorf("creating Maintenance Assignment (virtual machine ID: %q): %+v", virtualMachineIdRaw, err) - } + // It may take a few minutes after starting a VM for it to become available to assign to a configuration + resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { + if _, err := client.CreateOrUpdate(ctx, virtualMachineId.ResourceGroup, "Microsoft.Compute", "virtualMachines", virtualMachineId.Name, assignmentName, assignment); err != nil { + if strings.Contains(err.Error(), "It may take a few minutes after starting a VM for it to become available to assign to a configuration") { + return resource.RetryableError(fmt.Errorf("expected VM is available to assign to a configuration but was in pending state, retrying")) + } + return resource.NonRetryableError(fmt.Errorf("issuing creating request for Maintenance Assignment (virtual machine ID %q): %+v", virtualMachineIdRaw, err)) + } + + return nil + }) resp, err := getMaintenanceAssignmentVirtualMachine(ctx, client, virtualMachineId, virtualMachineIdRaw) if err != nil { diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go index 471d621c8c88..e9861ad9da0d 100644 --- a/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_dedicated_host.go @@ -16,7 +16,7 @@ type MaintenanceAssignmentDedicatedHostId struct { func MaintenanceAssignmentDedicatedHostID(input string) (*MaintenanceAssignmentDedicatedHostId, error) { groups := regexp.MustCompile(`^(.+)/providers/Microsoft\.Maintenance/configurationAssignments/([^/]+)$`).FindStringSubmatch(input) if len(groups) != 3 { - return nil, fmt.Errorf("parsing Maintenance Assignment Dedicated Host ID: %q: Expected 3 groups", input) + return nil, fmt.Errorf("parsing Maintenance Assignment Dedicated Host ID (%q)", input) } targetResourceId, name := groups[1], groups[2] diff --git a/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go b/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go index 326085ad8896..bcc30c0c0a23 100644 --- a/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go +++ b/azurerm/internal/services/maintenance/parse/maintenance_assignment_virtual_machine.go @@ -16,7 +16,7 @@ type MaintenanceAssignmentVirtualMachineId struct { func MaintenanceAssignmentVirtualMachineID(input string) (*MaintenanceAssignmentVirtualMachineId, error) { groups := regexp.MustCompile(`^(.+)/providers/Microsoft\.Maintenance/configurationAssignments/([^/]+)$`).FindStringSubmatch(input) if len(groups) != 3 { - return nil, fmt.Errorf("parsing Maintenance Assignment Virtual Machine ID: %q: Expected 3 groups", input) + return nil, fmt.Errorf("parsing Maintenance Assignment Virtual Machine ID (%q)", input) } targetResourceId, name := groups[1], groups[2] diff --git a/azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go b/azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go index 4de7a4f38efc..d50876ac685b 100644 --- a/azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go +++ b/azurerm/internal/services/maintenance/tests/maintenance_assignment_dedicated_host_resource_test.go @@ -3,7 +3,6 @@ package tests import ( "fmt" "testing" - "time" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -22,13 +21,7 @@ func TestAccAzureRMMaintenanceAssignmentDedicatedHost_basic(t *testing.T) { CheckDestroy: testCheckAzureRMMaintenanceAssignmentDedicatedHostDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_template(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data), + Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentDedicatedHostExists(data.ResourceName), ), @@ -47,13 +40,7 @@ func TestAccAzureRMMaintenanceAssignmentDedicatedHost_requiresImport(t *testing. CheckDestroy: testCheckAzureRMMaintenanceAssignmentDedicatedHostDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_template(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data), + Config: testAccAzureRMMaintenanceAssignmentDedicatedHost_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentDedicatedHostExists(data.ResourceName), ), diff --git a/azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go b/azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go index 0f1e742064e3..f059f6db73f4 100644 --- a/azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go +++ b/azurerm/internal/services/maintenance/tests/maintenance_assignment_virtual_machine_resource_test.go @@ -3,7 +3,6 @@ package tests import ( "fmt" "testing" - "time" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -22,13 +21,7 @@ func TestAccAzureRMMaintenanceAssignmentVirtualMachine_basic(t *testing.T) { CheckDestroy: testCheckAzureRMMaintenanceAssignmentVirtualMachineDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_template(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data), + Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentVirtualMachineExists(data.ResourceName), ), @@ -48,13 +41,7 @@ func TestAccAzureRMMaintenanceAssignmentVirtualMachine_requiresImport(t *testing CheckDestroy: testCheckAzureRMMaintenanceAssignmentVirtualMachineDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_template(data), - }, - { - // It may take a few minutes after starting a VM for it to become available to assign to a configuration - // for newly created machine, wait several minutes - PreConfig: func() { time.Sleep(5 * time.Minute) }, - Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data), + Config: testAccAzureRMMaintenanceAssignmentVirtualMachine_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMaintenanceAssignmentVirtualMachineExists(data.ResourceName), ), diff --git a/website/docs/r/maintenance_assignment_dedicated_host.html.markdown b/website/docs/r/maintenance_assignment_dedicated_host.html.markdown index f0d59a259e32..195291169420 100644 --- a/website/docs/r/maintenance_assignment_dedicated_host.html.markdown +++ b/website/docs/r/maintenance_assignment_dedicated_host.html.markdown @@ -55,11 +55,11 @@ resource "azurerm_maintenance_assignment_dedicated_host" "example" { The following arguments are supported: -* `location` - (Required) Specified the supported Azure location where the resource exists. Changing this forces a new resource to be created. +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `maintenance_configuration_id` - (Required) Specified the id of Maintenance Configuration Resource. Changing this forces a new resource to be created. +* `maintenance_configuration_id` - (Required) Specifies the ID of the Maintenance Configuration Resource. Changing this forces a new resource to be created. -* `dedicated_host_id` - (Required) Specified the Dedicated Host ID where the Maintenance Configuration will be assigned to. Changing this forces a new resource to be created. +* `dedicated_host_id` - (Required) Specifies the Dedicated Host ID to which the Maintenance Configuration will be assigned. Changing this forces a new resource to be created. ## Attributes Reference diff --git a/website/docs/r/maintenance_assignment_virtual_machine.html.markdown b/website/docs/r/maintenance_assignment_virtual_machine.html.markdown index ca739367672c..d47070da3169 100644 --- a/website/docs/r/maintenance_assignment_virtual_machine.html.markdown +++ b/website/docs/r/maintenance_assignment_virtual_machine.html.markdown @@ -94,11 +94,11 @@ resource "azurerm_maintenance_assignment_virtual_machine" "example" { The following arguments are supported: -* `location` - (Required) Specified the supported Azure location where the resource exists. Changing this forces a new resource to be created. +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `maintenance_configuration_id` - (Required) Specified the id of Maintenance Configuration Resource. Changing this forces a new resource to be created. +* `maintenance_configuration_id` - (Required) Specifies the ID of the Maintenance Configuration Resource. Changing this forces a new resource to be created. -* `virtual_machine_id` - (Required) Specified the Virtual Machine ID where the Maintenance Configuration will be assigned to. Changing this forces a new resource to be created. +* `virtual_machine_id` - (Required) Specifies the Virtual Machine ID to which the Maintenance Configuration will be assigned. Changing this forces a new resource to be created. ## Attributes Reference From 11f0305f64cde3d053c4ee4884c34027dab03604 Mon Sep 17 00:00:00 2001 From: njucz Date: Thu, 18 Jun 2020 10:36:09 +0800 Subject: [PATCH 6/6] update --- .../maintenance_assignment_dedicated_host_resource.go | 5 ++++- .../maintenance_assignment_virtual_machine_resource.go | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go index c1dedc63b6eb..17e111878a50 100644 --- a/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go +++ b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go @@ -92,7 +92,7 @@ func resourceArmMaintenanceAssignmentDedicatedHostCreate(d *schema.ResourceData, } // It may take a few minutes after starting a VM for it to become available to assign to a configuration - resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { + err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { if _, err := client.CreateOrUpdateParent(ctx, dedicatedHostId.ResourceGroup, "Microsoft.Compute", "hostGroups", dedicatedHostId.HostGroup, "hosts", dedicatedHostId.Name, assignmentName, assignment); err != nil { if strings.Contains(err.Error(), "It may take a few minutes after starting a VM for it to become available to assign to a configuration") { return resource.RetryableError(fmt.Errorf("expected VM is available to assign to a configuration but was in pending state, retrying")) @@ -102,6 +102,9 @@ func resourceArmMaintenanceAssignmentDedicatedHostCreate(d *schema.ResourceData, return nil }) + if err != nil { + return err + } resp, err := getMaintenanceAssignmentDedicatedHost(ctx, client, dedicatedHostId, dedicatedHostIdRaw) if err != nil { diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go index a4c8cc0d7b54..27ed274b9bd3 100644 --- a/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go +++ b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go @@ -92,7 +92,7 @@ func resourceArmMaintenanceAssignmentVirtualMachineCreate(d *schema.ResourceData } // It may take a few minutes after starting a VM for it to become available to assign to a configuration - resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { + err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { if _, err := client.CreateOrUpdate(ctx, virtualMachineId.ResourceGroup, "Microsoft.Compute", "virtualMachines", virtualMachineId.Name, assignmentName, assignment); err != nil { if strings.Contains(err.Error(), "It may take a few minutes after starting a VM for it to become available to assign to a configuration") { return resource.RetryableError(fmt.Errorf("expected VM is available to assign to a configuration but was in pending state, retrying")) @@ -102,6 +102,9 @@ func resourceArmMaintenanceAssignmentVirtualMachineCreate(d *schema.ResourceData return nil }) + if err != nil { + return err + } resp, err := getMaintenanceAssignmentVirtualMachine(ctx, client, virtualMachineId, virtualMachineIdRaw) if err != nil {