Merge pull request #219 from equinix/re_reservation_timeouts

consider metal_device delete timeout settings when awaiting hardware deprovision

docs/resources/device.md

@@ -173,6 +173,14 @@ The `reinstall` block has 3 fields:
 * `preserve_data` - (Optional) Whether the non-OS disks should be kept or wiped during reinstall. Defaults to `false`.
 * `deprovision_fast` - (Optional) Whether the OS disk should be filled with `00h` bytes before reinstall. Defaults to `false`.
 
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/configuration/resources#operation-timeouts) for certain actions:
+
+* `create` - (Defaults to 20 mins) Used when creating the Device. This includes the time to provision the OS.
+* `update` - (Defaults to 20 mins) Used when updating the Device. This includes the time needed to reprovision instances when `reinstall` arguments are used.
+* `delete` - (Defaults to 20 mins) Used when deleting the Device. This includes the time to deprovision a hardware reservation when `wait_for_reservation_deprovision` is enabled.
+
 ## Attributes Reference
 
 The following attributes are exported:

docs/resources/spot_market_request.md

@@ -61,7 +61,7 @@ The following arguments are supported:
 
 ### Timeouts
 
-The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#operation-timeouts) for certain actions:
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/configuration/resources#operation-timeouts) for certain actions:
 
 * `create` - (Defaults to 60 mins) Used when creating the Spot Market Request and `wait_for_devices == true`)
 * `delete` - (Defaults to 60 mins) Used when destroying the Spot Market Request and `wait for devices == true`

metal/helpers_device.go

@@ -13,8 +13,10 @@ import (
 	"github.com/packethost/packngo"
 )
 
-var wgMap = map[string]*sync.WaitGroup{}
-var wgMutex = sync.Mutex{}
+var (
+	wgMap   = map[string]*sync.WaitGroup{}
+	wgMutex = sync.Mutex{}
+)
 
 func ifToIPCreateRequest(m interface{}) packngo.IPAddressCreateRequest {
 	iacr := packngo.IPAddressCreateRequest{}
@@ -131,6 +133,8 @@ func hwReservationStateRefreshFunc(client *packngo.Client, reservationId, instan
 		case r != nil && r.Device != nil && (r.Device.ID != "" && r.Device.ID != instanceId):
 			log.Printf("[WARN] Equinix Metal device instance %s (reservation %s) was reprovisioned to a another instance (%s)", instanceId, reservationId, r.Device.ID)
 			state = reprovisioned
+		default:
+			log.Printf("[DEBUG] Equinix Metal device instance %s (reservation %s) is still deprovisioning", instanceId, reservationId)
 		}
 
 		return r, state, err
@@ -162,7 +166,6 @@ func getWaitForDeviceLock(deviceID string) *sync.WaitGroup {
 }
 
 func waitForDeviceAttribute(d *schema.ResourceData, targets []string, pending []string, attribute string, meta interface{}) (string, error) {
-
 	wg := getWaitForDeviceLock(d.Id())
 	wg.Wait()
 

metal/resource_metal_device.go

@@ -20,11 +20,15 @@ import (
 	"github.com/packethost/packngo"
 )
 
-var matchIPXEScript = regexp.MustCompile(`(?i)^#![i]?pxe`)
-var ipAddressTypes = []string{"public_ipv4", "private_ipv4", "public_ipv6"}
+var (
+	matchIPXEScript = regexp.MustCompile(`(?i)^#![i]?pxe`)
+	ipAddressTypes  = []string{"public_ipv4", "private_ipv4", "public_ipv6"}
+)
 
-var deviceCommonIncludes = []string{"project", "metro", "facility", "hardware_reservation"}
-var deviceReadOptions = &packngo.GetOptions{Includes: deviceCommonIncludes}
+var (
+	deviceCommonIncludes = []string{"project", "metro", "facility", "hardware_reservation"}
+	deviceReadOptions    = &packngo.GetOptions{Includes: deviceCommonIncludes}
+)
 
 func resourceMetalDevice() *schema.Resource {
 	return &schema.Resource{
@@ -719,12 +723,10 @@ func resourceMetalDeviceUpdate(d *schema.ResourceData, meta interface{}) error {
 		if _, _, err := client.Devices.Update(d.Id(), &ur); err != nil {
 			return friendlyError(err)
 		}
-
 	}
 
 	if d.HasChange("operating_system") || d.HasChange("user_data") || d.HasChange("custom_data") {
 		reinstallOptions, err := getReinstallOptions(d)
-
 		if err != nil {
 			return friendlyError(err)
 		}
@@ -773,6 +775,8 @@ func resourceMetalDeviceDelete(d *schema.ResourceData, meta interface{}) error {
 		fdv = true
 	}
 
+	start := time.Now()
+
 	resp, err := client.Devices.Delete(d.Id(), fdv)
 	if ignoreResponseErrors(httpForbidden, httpNotFound)(resp, err) != nil {
 		return friendlyError(err)
@@ -782,7 +786,10 @@ func resourceMetalDeviceDelete(d *schema.ResourceData, meta interface{}) error {
 	if resIdOk {
 		wfrd, wfrdOK := d.GetOk("wait_for_reservation_deprovision")
 		if wfrdOK && wfrd.(bool) {
-			err := waitUntilReservationProvisionable(client, resId.(string), d.Id(), 10*time.Second, 60*time.Minute, 3*time.Second)
+			// avoid "context: deadline exceeded"
+			timeout := d.Timeout(schema.TimeoutDelete) - time.Minute - time.Since(start)
+
+			err := waitUntilReservationProvisionable(client, resId.(string), d.Id(), 10*time.Second, timeout, 3*time.Second)
 			if err != nil {
 				return err
 			}