Merge pull request #5 from MustWin/custom-timeout

Custom timeout

Author: mikejihbe

.gitignore

@@ -34,6 +34,7 @@ terraform-Oracle-BareMetal-Provider
 *.orig
 .idea
 terraform-Oracle-BareMetal-Provider.iml
+terraform-provider-baremetal.iml
 .env
 crash.log
 terraform-encrypted-des.sh

crud/helpers.go

@@ -12,6 +12,8 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/client"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
+	"strconv"
+	"errors"
 )
 
 const FiveMinutes time.Duration = 5 * time.Minute
@@ -140,9 +142,16 @@ func stateRefreshFunc(sync StatefulResource) resource.StateRefreshFunc {
 }
 
 func waitForStateRefresh(sync StatefulResource, pending, target []string) (e error) {
-	timeout := FiveMinutes
+	timeoutStr := os.Getenv("TF_VAR_timeout_minutes")
+	t, err := strconv.Atoi(timeoutStr)
+	if err != nil {
+		return errors.New("timeout_minutes: " + err.Error())
+	}
+	timeout := time.Duration(t) * time.Minute
 	if customTimeouter, ok := sync.(CustomTimeouter); ok {
-		timeout = customTimeouter.CustomTimeout()
+		if customTimeouter.CustomTimeout() > timeout {
+			timeout = customTimeouter.CustomTimeout()
+		}
 	}
 	stateConf := &resource.StateChangeConf{
 		Pending: pending,

docs/examples/compute/single-instance/provider.tf

@@ -3,4 +3,5 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
+  timeout_minutes = "${var.timeout_minutes}"
 }

docs/examples/compute/single-instance/variables.tf

@@ -14,6 +14,10 @@ variable "AD" {
     default = "1"
 }
 
+variable "timeout_minutes" {
+    default = 5
+}
+
 variable "InstanceShape" {
     default = "VM.Standard1.2"
 }

provider.go

@@ -13,6 +13,8 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/objectstorage"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
+	"os"
+	"strconv"
 )
 
 var descriptions map[string]string
@@ -27,11 +29,15 @@ func init() {
 		"private_key_path": "(Optional) The path to the user's PEM formatted private key.\n" +
 			"A private_key or a private_key_path must be provided.",
 		"private_key_password": "(Optional) The password used to secure the private key.",
+		"timeout_minutes": "(Optional) The minimum API timeout for requests",
 	}
 }
 
 // Provider is the adapter for terraform, that gives access to all the resources
 func Provider(configfn schema.ConfigureFunc) terraform.ResourceProvider {
+	if os.Getenv("TF_ORACLE_ENV") == "test" && os.Getenv("TF_VAR_timeout_minutes") == "" {
+		os.Setenv("TF_VAR_timeout_minutes", "5") // This is for testing, it is overwritten correctly in ConfigureFunc when not in testmode
+	}
 	return &schema.Provider{
 		DataSourcesMap: dataSourcesMap(),
 		Schema:         schemaMap(),
@@ -65,6 +71,12 @@ func schemaMap() map[string]*schema.Schema {
 			Sensitive:   true,
 			Description: descriptions["private_key"],
 		},
+		"timeout_minutes": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Default:     5,
+			Description: descriptions["timeout_minutes"],
+		},
 		"private_key_path": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -167,6 +179,8 @@ func providerConfig(d *schema.ResourceData) (client interface{}, err error) {
 	privateKeyBuffer, hasKey := d.Get("private_key").(string)
 	privateKeyPath, hasKeyPath := d.Get("private_key_path").(string)
 	privateKeyPassword, hasKeyPass := d.Get("private_key_password").(string)
+	defaultTimeout := d.Get("timeout_minutes").(int)
+	os.Setenv("TF_VAR_timeout_minutes", strconv.Itoa(defaultTimeout))
 
 	clientOpts := []baremetal.NewClientOptionsFunc{
 		func(o *baremetal.NewClientOptions) {