Merge pull request #11 from displague/feature/user-timeouts-for-linodes-images-volumes

add support for timeouts on instance, image, and volume resources

Author: displague

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 1.2.1 (Unreleased)
+
+ENHANCEMENTS:
+
+* resource/linode\_instance: Add `timeouts` support for `create`, `update`, and `delete` (defaults 10, 20, 10)
+* resource/linode\_image: Add `timeouts` support for `create` (defaults 20)
+* resource/linode\_volume: Add `timeouts` support for `create`, `update`, and `delete` (defaults 10, 20, 10)
+
 ## 1.2.0 (November 08, 2018)
 
 ENHANCEMENTS:

linode/linode_instance_helpers.go

@@ -461,7 +461,7 @@ func makeVolumeDetacher(client linodego.Client, d *schema.ResourceData) volumeDe
 		}
 
 		log.Printf("[INFO] Waiting for Linode Volume %d to detach ...", volumeID)
-		if _, err := client.WaitForVolumeLinodeID(ctx, volumeID, nil, int(d.Timeout("update").Seconds())); err != nil {
+		if _, err := client.WaitForVolumeLinodeID(ctx, volumeID, nil, int(d.Timeout(schema.TimeoutUpdate).Seconds())); err != nil {
 			return err
 		}
 		return nil

linode/resource_linode_image.go

@@ -10,6 +10,10 @@ import (
 	"github.com/linode/linodego"
 )
 
+const (
+	LinodeImageCreateTimeout = 20 * time.Minute
+)
+
 func resourceLinodeImage() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceLinodeImageCreate,
@@ -20,6 +24,9 @@ func resourceLinodeImage() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(LinodeImageCreateTimeout),
+		},
 		Schema: map[string]*schema.Schema{
 			"label": {
 				Type:        schema.TypeString,
@@ -144,7 +151,7 @@ func resourceLinodeImageCreate(d *schema.ResourceData, meta interface{}) error {
 	linodeID := d.Get("linode_id").(int)
 	diskID := d.Get("disk_id").(int)
 
-	if _, err := client.WaitForInstanceDiskStatus(context.Background(), linodeID, diskID, linodego.DiskReady, int(d.Timeout("create").Seconds())); err != nil {
+	if _, err := client.WaitForInstanceDiskStatus(context.Background(), linodeID, diskID, linodego.DiskReady, int(d.Timeout(schema.TimeoutCreate).Seconds())); err != nil {
 		return fmt.Errorf("Error waiting for Linode Instance %d Disk %d to become ready for taking an Image", linodeID, diskID)
 	}
 
@@ -164,7 +171,7 @@ func resourceLinodeImageCreate(d *schema.ResourceData, meta interface{}) error {
 	d.SetPartial("description")
 	d.Partial(false)
 
-	if _, err := client.WaitForInstanceDiskStatus(context.Background(), linodeID, diskID, linodego.DiskReady, int(d.Timeout("create").Seconds())); err != nil {
+	if _, err := client.WaitForInstanceDiskStatus(context.Background(), linodeID, diskID, linodego.DiskReady, int(d.Timeout(schema.TimeoutCreate).Seconds())); err != nil {
 		return fmt.Errorf("Error waiting for Linode Instance %d Disk %d to become ready while taking an Image", linodeID, diskID)
 	}
 

linode/resource_linode_instance.go

@@ -12,17 +12,27 @@ import (
 	"github.com/linode/linodego"
 )
 
+const (
+	LinodeInstanceCreateTimeout = 10 * time.Minute
+	LinodeInstanceUpdateTimeout = 20 * time.Minute
+	LinodeInstanceDeleteTimeout = 10 * time.Minute
+)
+
 func resourceLinodeInstance() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceLinodeInstanceCreate,
 		Read:   resourceLinodeInstanceRead,
 		Update: resourceLinodeInstanceUpdate,
 		Delete: resourceLinodeInstanceDelete,
 		Exists: resourceLinodeInstanceExists,
-
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(LinodeInstanceCreateTimeout),
+			Update: schema.DefaultTimeout(LinodeInstanceUpdateTimeout),
+			Delete: schema.DefaultTimeout(LinodeInstanceDeleteTimeout),
+		},
 		Schema: map[string]*schema.Schema{
 			"image": &schema.Schema{
 				Type:          schema.TypeString,

linode/resource_linode_volume.go

@@ -5,11 +5,18 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/linode/linodego"
 )
 
+const (
+	LinodeVolumeCreateTimeout = 10 * time.Minute
+	LinodeVolumeUpdateTimeout = 20 * time.Minute
+	LinodeVolumeDeleteTimeout = 10 * time.Minute
+)
+
 func resourceLinodeVolume() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceLinodeVolumeCreate,
@@ -20,6 +27,11 @@ func resourceLinodeVolume() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(LinodeVolumeCreateTimeout),
+			Update: schema.DefaultTimeout(LinodeVolumeUpdateTimeout),
+			Delete: schema.DefaultTimeout(LinodeVolumeDeleteTimeout),
+		},
 		Schema: map[string]*schema.Schema{
 			"label": &schema.Schema{
 				Type:        schema.TypeString,
@@ -137,13 +149,13 @@ func resourceLinodeVolumeCreate(d *schema.ResourceData, meta interface{}) error
 	d.SetPartial("size")
 
 	if createOpts.LinodeID > 0 {
-		if _, err := client.WaitForVolumeLinodeID(context.Background(), volume.ID, linodeID, int(d.Timeout("update").Seconds())); err != nil {
+		if _, err := client.WaitForVolumeLinodeID(context.Background(), volume.ID, linodeID, int(d.Timeout(schema.TimeoutUpdate).Seconds())); err != nil {
 			return err
 		}
 		d.SetPartial("linode_id")
 	}
 
-	if _, err = client.WaitForVolumeStatus(context.Background(), volume.ID, linodego.VolumeActive, int(d.Timeout("create").Seconds())); err != nil {
+	if _, err = client.WaitForVolumeStatus(context.Background(), volume.ID, linodego.VolumeActive, int(d.Timeout(schema.TimeoutCreate).Seconds())); err != nil {
 		return err
 	}
 
@@ -172,7 +184,7 @@ func resourceLinodeVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 			return err
 		}
 
-		if _, err = client.WaitForVolumeStatus(context.Background(), volume.ID, linodego.VolumeActive, int(d.Timeout("update").Seconds())); err != nil {
+		if _, err = client.WaitForVolumeStatus(context.Background(), volume.ID, linodego.VolumeActive, int(d.Timeout(schema.TimeoutUpdate).Seconds())); err != nil {
 			return err
 		}
 
@@ -206,7 +218,7 @@ func resourceLinodeVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 			}
 
 			log.Printf("[INFO] Waiting for Linode Volume %d to detach ...", volume.ID)
-			if _, err = client.WaitForVolumeLinodeID(context.Background(), volume.ID, nil, int(d.Timeout("update").Seconds())); err != nil {
+			if _, err = client.WaitForVolumeLinodeID(context.Background(), volume.ID, nil, int(d.Timeout(schema.TimeoutUpdate).Seconds())); err != nil {
 				return err
 			}
 		}
@@ -224,7 +236,7 @@ func resourceLinodeVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 			}
 
 			log.Printf("[INFO] Waiting for Linode Volume %d to attach ...", volume.ID)
-			if _, err = client.WaitForVolumeLinodeID(context.Background(), volume.ID, linodeID, int(d.Timeout("update").Seconds())); err != nil {
+			if _, err = client.WaitForVolumeLinodeID(context.Background(), volume.ID, linodeID, int(d.Timeout(schema.TimeoutUpdate).Seconds())); err != nil {
 				return err
 			}
 		}
@@ -252,7 +264,7 @@ func resourceLinodeVolumeDelete(d *schema.ResourceData, meta interface{}) error
 	}
 
 	log.Printf("[INFO] Waiting for Linode Volume %d to detach ...", id)
-	if _, err := client.WaitForVolumeLinodeID(context.Background(), id, nil, int(d.Timeout("update").Seconds())); err != nil {
+	if _, err := client.WaitForVolumeLinodeID(context.Background(), id, nil, int(d.Timeout(schema.TimeoutUpdate).Seconds())); err != nil {
 		return err
 	}
 

website/docs/r/image.html.md

@@ -44,6 +44,12 @@ The following arguments are supported:
 
 * `description` - (Optional) A detailed description of this Image.
 
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 20 mins) Used when creating the instance image (until the instance is available)
+
 ## Attributes
 
 This resource exports the following attributes:

website/docs/r/instance.html.md

@@ -204,6 +204,14 @@ Configuration profiles define the VM settings and boot behavior of the Linode In
 
     * `memory_limit` - (Optional) - Defaults to the total RAM of the Linode
 
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 10 mins) Used when launching the instance (until it reaches the initial `running` state)
+* `update` - (Defaults to 20 mins) Used when stopping and starting the instance when necessary during update - e.g. when changing instance type
+* `delete` - (Defaults to 10 mins) Used when terminating the instance
+
 ## Attributes
 
 This Linode Instance resource exports the following attributes:
@@ -248,4 +256,4 @@ When importing an instance, all `disk` and `config` values must be represented.
 
 Imported disks must include their `label` value.  **Any disk that is not precisely represented may be removed resulting in data loss.**
 
-Imported configs should include all `devices`, and must include `label`, `kernel`, and the `root_device`.  The instance must include a `boot_config_label` referring to the correct configuration profile.
+Imported configs should include all `devices`, and must include `label`, `kernel`, and the `root_device`.  The instance must include a `boot_config_label` referring to the correct configuration profile.

website/docs/r/volume.html.md

@@ -60,6 +60,14 @@ The following arguments are supported:
 
 * `linode_id` - (Optional) The ID of a Linode Instance where the the Volume should be attached.
 
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 10 mins) Used when creating the volume (until the volume is reaches the initial `active` state)
+* `update` - (Defaults to 20 mins) Used when updating the volume when necessary during update - e.g. when resizing the volume
+* `delete` - (Defaults to 10 mins) Used when deleting the volume
+
 ## Attributes
 
 This resource exports the following attributes: