From aa3677cd896809718f26d066216ded14673a7961 Mon Sep 17 00:00:00 2001
From: clint shryock <clint@ctshryock.com>
Date: Tue, 7 Mar 2017 10:25:32 -0600
Subject: [PATCH] helper/schema: Guard against a panic if Timeout is not
 properly structured

---
 helper/schema/resource_timeout.go | 81 ++++++++++++++++---------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/helper/schema/resource_timeout.go b/helper/schema/resource_timeout.go
index 61f03a4ad..908d3e406 100644
--- a/helper/schema/resource_timeout.go
+++ b/helper/schema/resource_timeout.go
@@ -61,52 +61,55 @@ func (t *ResourceTimeout) ConfigDecode(s *Resource, c *terraform.ResourceConfig)
 	}
 
 	if raw, ok := c.Config["timeout"]; ok {
-		configTimeouts := raw.([]map[string]interface{})
-		for _, timeoutValues := range configTimeouts {
-			// loop through each Timeout given in the configuration and validate they
-			// the Timeout defined in the resource
-			for timeKey, timeValue := range timeoutValues {
-				// validate that we're dealing with the normal CRUD actions
-				var found bool
-				for _, key := range timeoutKeys() {
-					if timeKey == key {
-						found = true
-						break
+		if configTimeouts, ok := raw.([]map[string]interface{}); ok {
+			for _, timeoutValues := range configTimeouts {
+				// loop through each Timeout given in the configuration and validate they
+				// the Timeout defined in the resource
+				for timeKey, timeValue := range timeoutValues {
+					// validate that we're dealing with the normal CRUD actions
+					var found bool
+					for _, key := range timeoutKeys() {
+						if timeKey == key {
+							found = true
+							break
+						}
 					}
-				}
 
-				if !found {
-					return fmt.Errorf("Unsupported Timeout configuration key found (%s)", timeKey)
-				}
+					if !found {
+						return fmt.Errorf("Unsupported Timeout configuration key found (%s)", timeKey)
+					}
 
-				// Get timeout
-				rt, err := time.ParseDuration(timeValue.(string))
-				if err != nil {
-					return fmt.Errorf("Error parsing Timeout for (%s): %s", timeKey, err)
-				}
+					// Get timeout
+					rt, err := time.ParseDuration(timeValue.(string))
+					if err != nil {
+						return fmt.Errorf("Error parsing Timeout for (%s): %s", timeKey, err)
+					}
 
-				var timeout *time.Duration
-				switch timeKey {
-				case TimeoutCreate:
-					timeout = t.Create
-				case TimeoutUpdate:
-					timeout = t.Update
-				case TimeoutRead:
-					timeout = t.Read
-				case TimeoutDelete:
-					timeout = t.Delete
-				case TimeoutDefault:
-					timeout = t.Default
-				}
+					var timeout *time.Duration
+					switch timeKey {
+					case TimeoutCreate:
+						timeout = t.Create
+					case TimeoutUpdate:
+						timeout = t.Update
+					case TimeoutRead:
+						timeout = t.Read
+					case TimeoutDelete:
+						timeout = t.Delete
+					case TimeoutDefault:
+						timeout = t.Default
+					}
 
-				// If the resource has not delcared this in the definition, then error
-				// with an unsupported message
-				if timeout == nil {
-					return unsupportedTimeoutKeyError(timeKey)
-				}
+					// If the resource has not delcared this in the definition, then error
+					// with an unsupported message
+					if timeout == nil {
+						return unsupportedTimeoutKeyError(timeKey)
+					}
 
-				*timeout = rt
+					*timeout = rt
+				}
 			}
+		} else {
+			log.Printf("[WARN] Invalid Timeout structure found, skipping timeouts")
 		}
 	}