Move endpoint options into endpoints block

builtin/providers/aws/config.go

@@ -11,6 +11,8 @@ import (
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/go-multierror"
 
+	"crypto/tls"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	awsCredentials "github.com/aws/aws-sdk-go/aws/credentials"
@@ -45,8 +47,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/sns"
 	"github.com/aws/aws-sdk-go/service/sqs"
-        "net/http"
-        "crypto/tls"
 )
 
 type Config struct {

builtin/providers/aws/provider.go

@@ -1,6 +1,10 @@
 package aws
 
 import (
+	"bytes"
+	"fmt"
+
+	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/mutexkv"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
@@ -96,25 +100,8 @@ func Provider() terraform.ResourceProvider {
 				Default:     "",
 				Description: descriptions["kinesis_endpoint"],
 			},
-                        "iam_endpoint": &schema.Schema{
-                                Type:        schema.TypeString,
-                                Optional:    true,
-                                Default:     "",
-                                Description: descriptions["iam_endpoint"],
-                        },
+			"endpoints": endpointsSchema(),
 
-                        "ec2_endpoint": &schema.Schema{
-                                Type:        schema.TypeString,
-                                Optional:    true,
-                                Default:     "",
-                                Description: descriptions["ec2_endpoint"],
-                        },
-                        "elb_endpoint": &schema.Schema{
-                                Type:        schema.TypeString,
-                                Optional:    true,
-                                Default:     "",
-                                Description: descriptions["elb_endpoint"],
-                        },
 			"insecure": &schema.Schema{
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -283,6 +270,7 @@ func init() {
 
 		"insecure": "Explicitly allow the provider to perform \"insecure\" SSL requests. If omitted," +
 			"default value is `false`",
+		"default value is `false`",
 	}
 }
 
@@ -297,12 +285,18 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		MaxRetries:       d.Get("max_retries").(int),
 		DynamoDBEndpoint: d.Get("dynamodb_endpoint").(string),
 		KinesisEndpoint:  d.Get("kinesis_endpoint").(string),
-                IamEndpoint:	  d.Get("iam_endpoint").(string),
-                Ec2Endpoint:	  d.Get("ec2_endpoint").(string),
-                ElbEndpoint:	  d.Get("elb_endpoint").(string),
 		Insecure:         d.Get("insecure").(bool),
 	}
 
+	endpointsSet := d.Get("endpoints").(*schema.Set)
+
+	for _, endpointsSetI := range endpointsSet.List() {
+		endpoints := endpointsSetI.(map[string]interface{})
+		config.IamEndpoint = endpoints["iam"].(string)
+		config.Ec2Endpoint = endpoints["ec2"].(string)
+		config.ElbEndpoint = endpoints["elb"].(string)
+	}
+
 	if v, ok := d.GetOk("allowed_account_ids"); ok {
 		config.AllowedAccountIds = v.(*schema.Set).List()
 	}
@@ -316,3 +310,45 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 
 // This is a global MutexKV for use within this plugin.
 var awsMutexKV = mutexkv.NewMutexKV()
+
+func endpointsSchema() *schema.Schema {
+	return &schema.Schema{
+		Type:     schema.TypeSet,
+		Optional: true,
+		Elem: &schema.Resource{
+			Schema: map[string]*schema.Schema{
+				"iam": &schema.Schema{
+					Type:        schema.TypeString,
+					Optional:    true,
+					Default:     "",
+					Description: descriptions["iam_endpoint"],
+				},
+
+				"ec2": &schema.Schema{
+					Type:        schema.TypeString,
+					Optional:    true,
+					Default:     "",
+					Description: descriptions["ec2_endpoint"],
+				},
+
+				"elb": &schema.Schema{
+					Type:        schema.TypeString,
+					Optional:    true,
+					Default:     "",
+					Description: descriptions["elb_endpoint"],
+				},
+			},
+		},
+		Set: endpointsToHash,
+	}
+}
+
+func endpointsToHash(v interface{}) int {
+	var buf bytes.Buffer
+	m := v.(map[string]interface{})
+	buf.WriteString(fmt.Sprintf("%s-", m["iam"].(string)))
+	buf.WriteString(fmt.Sprintf("%s-", m["ec2"].(string)))
+	buf.WriteString(fmt.Sprintf("%s-", m["elb"].(string)))
+
+	return hashcode.String(buf.String())
+}

website/source/docs/providers/aws/index.html.markdown

@@ -149,9 +149,6 @@ The following arguments are supported in the `provider` block:
   URL constructed from the `region`. It's typically used to connect to
   custom ec2 endpoints.
 
-* `elb_endpoint` - (Optional) Use this to override the default endpoint
-  URL constructed from the `region`. It's typically used to connect to
-  custom elb endpoints.
 
 * `token` - (Optional) Use this to set an MFA token. It can also be
   sourced from the `AWS_SECURITY_TOKEN` environment variable.