Added timeout param

client/client.go

@@ -22,6 +22,7 @@ var ErrInvalidDecodeResponseParameter = errors.New("nil interface provided to de
 type Config struct {
 	Address string
 	Auth    *Auth
+	Timeout time.Duration
 }
 
 // NewConfig new config
@@ -53,7 +54,7 @@ func NewClient(config *Config) (*Client, error) {
 
 func newTLSHTTPClient(config *Config) (*http.Client, error) {
 	if config.Auth == nil {
-		return http.DefaultClient, nil
+		return &http.Client{Timeout: config.Timeout}, nil
 	}
 
 	var cert tls.Certificate
@@ -75,7 +76,7 @@ func newTLSHTTPClient(config *Config) (*http.Client, error) {
 		}
 		cert, err = tls.LoadX509KeyPair(certPath, keyPath)
 	} else {
-		return http.DefaultClient, nil
+		return &http.Client{Timeout: config.Timeout}, nil
 	}
 	if err != nil {
 		return nil, err
@@ -87,7 +88,7 @@ func newTLSHTTPClient(config *Config) (*http.Client, error) {
 	}
 	tlsConfig.BuildNameToCertificate()
 	transport := &http.Transport{TLSClientConfig: tlsConfig}
-	return &http.Client{Transport: transport}, nil
+	return &http.Client{Transport: transport, Timeout: config.Timeout}, nil
 }
 
 func decodeBase64KeyPair(cert64, key64 string) (tls.Certificate, error) {

provider/provider.go

@@ -70,6 +70,13 @@ func Provider() terraform.ResourceProvider {
 				Default:     true,
 				Description: "If http client should skip ssl validation",
 			},
+
+			"timeout": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Default:     300,
+				Description: "Time in seconds to wait for operations of api client, default is 300s",
+			},
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{

provider/provider_config.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"github.com/jgramoll/terraform-provider-spinnaker/client"
+	"time"
 )
 
 // config for provider
@@ -14,6 +15,7 @@ type providerConfig struct {
 	KeyContent  string `mapstructure:"key_content"`
 	UserEmail   string `mapstructure:"user_email"`
 	Insecure    bool   `mapstructure:"insecure"`
+	Timeout     int    `mapstructure:"timeout"`
 }
 
 func newProviderConfig() *providerConfig {
@@ -31,6 +33,7 @@ func (c *providerConfig) toClientConfig() *client.Config {
 	clientConfig.Auth.KeyContent = c.KeyContent
 	clientConfig.Auth.UserEmail = c.UserEmail
 	clientConfig.Auth.Insecure = c.Insecure
+	clientConfig.Timeout = time.Duration(c.Timeout) * time.Second
 
 	return clientConfig
 }

provider/provider_test.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"os"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/terraform/config"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -34,6 +35,7 @@ func TestProviderConfigure(t *testing.T) {
 			"cert_path": os.Getenv("SPINNAKER_CERT"),
 			"key_path":  os.Getenv("SPINNAKER_KEY"),
 		},
+		"timeout": 300,
 	}
 	rawConfig, configErr := config.NewRawConfig(raw)
 	if configErr != nil {
@@ -62,6 +64,11 @@ func TestProviderConfigure(t *testing.T) {
 	if config.Auth.KeyPath != auth["key_path"] {
 		t.Fatalf("keyPath should be %#v, not %#v", auth["key_path"], config.Auth.KeyPath)
 	}
+
+	configTimeout := int(config.Timeout / time.Second)
+	if configTimeout != raw["timeout"] {
+		t.Fatalf("timeout should be %#v, not %#v", raw["timeout"], configTimeout)
+	}
 }
 
 func testAccPreCheck(t *testing.T) {