Merge branch 'master' into b-aws-iam-role-profile-update

* master: (91 commits) update CHANGELOG update CHANGELOG state/remote: more canonical Go for skip TLS verify update CHANGELOG update CHANGELOG command/apply: flatten multierrors provider/aws: improve iam_policy err msgs acc tests: ensure each resource has a _basic test aws/provider convert _normal tests to _basic go fmt Enpoint type configuration for OpenStack provider Fix page title for aws_elasticache_cluster Update CHANGELOG.md Corrected Frankfurt S3 Website Endpoint fixes #2258 Only run Swift tests when Swift is available Implement OpenStack/Swift remote Minor correction to aws_s3_bucket docs docs: Fix wrong title (aws_autoscaling_notification) provider/aws: clarify scaling timeout error Update CHANGELOG.md ...
hashicorp · Jun 8, 2015 · 35047db · 35047db
2 parents 015c111 + 5a28dad
commit 35047db
Show file tree

Hide file tree

Showing 216 changed files with 7,126 additions and 561 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,38 @@
 ## 0.6.0 (Unreleased)
 
+FEATURES:
+
+ * **New provider: `azure`** [GH-2053]
+ * **New resource: `aws_autoscaling_notification`** [GH-2197]
+ * **New resource: `aws_ecs_cluster`** [GH-1803]
+ * **New resource: `aws_ecs_service`** [GH-1803]
+ * **New resource: `aws_ecs_task_definition`** [GH-1803]
+ * **New remote state backend: `swift`**: You can now store remote state in
+ a OpenStack Swift. [GH-2254]
+ * command/output: support display of module outputs [GH-2102]
+ * core: keys() and values() funcs for map variables [GH-2198]
+
+IMPROVEMENTS:
+
+ * core: HTTP remote state now accepts `skip_cert_verification`
+ option to ignore TLS cert verification. [GH-2214]
+ * provider/aws: ElastiCache Subnet Groups can be updated
+ without destroying first [GH-2191]
+ * provider/docker: `docker_container` has the `privileged`
+ option. [GH-2227]
+ * provider/openstack: allow `OS_AUTH_TOKEN` environment variable
+ to set the openstack `api_key` field [GH-2234]
+ * provider/openstack: Can now configure endpoint type (public, admin,
+ internal) [GH-2262]
+
+BUG FIXES:
+
+ * provider/aws: fix panic when route has no cidr_block [GH-2215]
+ * provider/aws: fix issue causing perpetual diff on ELB listeners
+ when non-lowercase protocol strings were used [GH-2246]
+ * provider/aws: corrected frankfurt S3 website region [GH-2259]
+ * provider/aws: `aws_elasticache_cluster` port is required [GH-2160]
+
 ## 0.5.3 (June 1, 2015)
 
 IMPROVEMENTS:
@@ -140,7 +173,7 @@ IMPROVEMENTS:
  * **New resource: `google_dns_record_set`**
  * **Migrate to upstream AWS SDK:** Migrate the AWS provider to
  [awslabs/aws-sdk-go](https://github.com/awslabs/aws-sdk-go),
- the offical `awslabs` library. Previously we had forked the library for
+ the official `awslabs` library. Previously we had forked the library for
  stability while `awslabs` refactored. Now that work has completed, and we've
  migrated back to the upstream version.
  * core: Improve error message on diff mismatch [GH-1501]
@@ -168,7 +201,7 @@ IMPROVEMENTS:
  * provider/aws: `aws_network_acl` improved validation for network ACL ports
  and protocols [GH-1798] [GH-1808]
  * provider/aws: `aws_route_table` can target network interfaces [GH-968]
- * provider/aws: `aws_route_table` can specify propogating VGWs [GH-1516]
+ * provider/aws: `aws_route_table` can specify propagating VGWs [GH-1516]
  * provider/aws: `aws_route53_record` supports weighted sets [GH-1578]
  * provider/aws: `aws_route53_zone` exports nameservers [GH-1525]
  * provider/aws: `aws_s3_bucket` website support [GH-1738]
@@ -325,7 +358,7 @@ FEATURES:
  * **Math operations** in interpolations. You can now do things like
  `${count.index+1}`. [GH-1068]
  * **New AWS SDK:** Move to `aws-sdk-go` (hashicorp/aws-sdk-go),
- a fork of the offical `awslabs` repo. We forked for stability while
+ a fork of the official `awslabs` repo. We forked for stability while
  `awslabs` refactored the library, and will move back to the officially
  supported version in the next release.
 
@@ -354,7 +387,7 @@ IMPROVEMENTS:
  * providers/aws: Improve dependency violation error handling, when deleting
  Internet Gateways or Auto Scaling groups [GH-1325].
  * provider/aws: Add non-destructive updates to AWS RDS. You can now upgrade
- `egine_version`, `parameter_group_name`, and `multi_az` without forcing
+ `engine_version`, `parameter_group_name`, and `multi_az` without forcing
  a new database to be created.[GH-1341]
  * providers/aws: Full support for block device mappings on instances and
  launch configurations [GH-1045, GH-1364]

diff --git a/builtin/bins/provider-azure/main.go b/builtin/bins/provider-azure/main.go
@@ -0,0 +1,12 @@
+package main
+
+import (
+ "github.com/hashicorp/terraform/builtin/providers/azure"
+ "github.com/hashicorp/terraform/plugin"
+)
+
+func main() {
+ plugin.Serve(&plugin.ServeOpts{
+ ProviderFunc: azure.Provider,
+ })
+}
diff --git a/builtin/bins/provider-azure/main_test.go b/builtin/bins/provider-azure/main_test.go
@@ -0,0 +1 @@
+package main
diff --git a/builtin/providers/aws/autoscaling_tags.go b/builtin/providers/aws/autoscaling_tags.go
@@ -5,8 +5,8 @@ import (
  "fmt"
  "log"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/service/autoscaling"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/service/autoscaling"
  "github.com/hashicorp/terraform/helper/hashcode"
  "github.com/hashicorp/terraform/helper/schema"
 )

diff --git a/builtin/providers/aws/autoscaling_tags_test.go b/builtin/providers/aws/autoscaling_tags_test.go
@@ -5,7 +5,7 @@ import (
  "reflect"
  "testing"
 
- "github.com/awslabs/aws-sdk-go/service/autoscaling"
+ "github.com/aws/aws-sdk-go/service/autoscaling"
  "github.com/hashicorp/terraform/helper/resource"
  "github.com/hashicorp/terraform/terraform"
 )

diff --git a/builtin/providers/aws/config.go b/builtin/providers/aws/config.go
@@ -7,19 +7,20 @@ import (
 
  "github.com/hashicorp/terraform/helper/multierror"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/aws/credentials"
- "github.com/awslabs/aws-sdk-go/service/autoscaling"
- "github.com/awslabs/aws-sdk-go/service/ec2"
- "github.com/awslabs/aws-sdk-go/service/elasticache"
- "github.com/awslabs/aws-sdk-go/service/elb"
- "github.com/awslabs/aws-sdk-go/service/iam"
- "github.com/awslabs/aws-sdk-go/service/kinesis"
- "github.com/awslabs/aws-sdk-go/service/rds"
- "github.com/awslabs/aws-sdk-go/service/route53"
- "github.com/awslabs/aws-sdk-go/service/s3"
- "github.com/awslabs/aws-sdk-go/service/sns"
- "github.com/awslabs/aws-sdk-go/service/sqs"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/aws/credentials"
+ "github.com/aws/aws-sdk-go/service/autoscaling"
+ "github.com/aws/aws-sdk-go/service/ec2"
+ "github.com/aws/aws-sdk-go/service/ecs"
+ "github.com/aws/aws-sdk-go/service/elasticache"
+ "github.com/aws/aws-sdk-go/service/elb"
+ "github.com/aws/aws-sdk-go/service/iam"
+ "github.com/aws/aws-sdk-go/service/kinesis"
+ "github.com/aws/aws-sdk-go/service/rds"
+ "github.com/aws/aws-sdk-go/service/route53"
+ "github.com/aws/aws-sdk-go/service/s3"
+ "github.com/aws/aws-sdk-go/service/sns"
+ "github.com/aws/aws-sdk-go/service/sqs"
 )
 
 type Config struct {
@@ -35,6 +36,7 @@ type Config struct {
 
 type AWSClient struct {
  ec2conn *ec2.EC2
+ ecsconn *ecs.ECS
  elbconn *elb.ELB
  autoscalingconn *autoscaling.AutoScaling
  s3conn *s3.S3
@@ -116,6 +118,9 @@ func (c *Config) Client() (interface{}, error) {
  log.Println("[INFO] Initializing EC2 Connection")
  client.ec2conn = ec2.New(awsConfig)
 
+ log.Println("[INFO] Initializing ECS Connection")
+ client.ecsconn = ecs.New(awsConfig)
+
  // aws-sdk-go uses v4 for signing requests, which requires all global
  // endpoints to use 'us-east-1'.
  // See http://docs.aws.amazon.com/general/latest/gr/sigv4_changes.html

diff --git a/builtin/providers/aws/network_acl_entry.go b/builtin/providers/aws/network_acl_entry.go
@@ -5,8 +5,8 @@ import (
  "net"
  "strconv"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/service/ec2"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/service/ec2"
 )
 
 func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2.NetworkACLEntry, error) {

diff --git a/builtin/providers/aws/network_acl_entry_test.go b/builtin/providers/aws/network_acl_entry_test.go
@@ -4,8 +4,8 @@ import (
  "reflect"
  "testing"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/service/ec2"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/service/ec2"
 )
 
 func Test_expandNetworkACLEntry(t *testing.T) {

diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go
@@ -85,12 +85,16 @@ func Provider() terraform.ResourceProvider {
  ResourcesMap: map[string]*schema.Resource{
  "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(),
  "aws_autoscaling_group": resourceAwsAutoscalingGroup(),
+ "aws_autoscaling_notification": resourceAwsAutoscalingNotification(),
  "aws_customer_gateway": resourceAwsCustomerGateway(),
  "aws_db_instance": resourceAwsDbInstance(),
  "aws_db_parameter_group": resourceAwsDbParameterGroup(),
  "aws_db_security_group": resourceAwsDbSecurityGroup(),
  "aws_db_subnet_group": resourceAwsDbSubnetGroup(),
  "aws_ebs_volume": resourceAwsEbsVolume(),
+ "aws_ecs_cluster": resourceAwsEcsCluster(),
+ "aws_ecs_service": resourceAwsEcsService(),
+ "aws_ecs_task_definition": resourceAwsEcsTaskDefinition(),
  "aws_eip": resourceAwsEip(),
  "aws_elasticache_cluster": resourceAwsElasticacheCluster(),
  "aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(),

diff --git a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy.go b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy.go
@@ -4,9 +4,9 @@ import (
  "fmt"
  "strings"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/aws/awserr"
- "github.com/awslabs/aws-sdk-go/service/elb"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/aws/awserr"
+ "github.com/aws/aws-sdk-go/service/elb"
  "github.com/hashicorp/terraform/helper/schema"
 )
 

diff --git a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go
@@ -4,14 +4,14 @@ import (
  "fmt"
  "testing"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/service/elb"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/service/elb"
 
  "github.com/hashicorp/terraform/helper/resource"
  "github.com/hashicorp/terraform/terraform"
 )
 
-func TestAccAWSAppCookieStickinessPolicy(t *testing.T) {
+func TestAccAWSAppCookieStickinessPolicy_basic(t *testing.T) {
  resource.Test(t, resource.TestCase{
  PreCheck: func() { testAccPreCheck(t) },
  Providers: testAccProviders,

diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go
@@ -9,10 +9,10 @@ import (
  "github.com/hashicorp/terraform/helper/resource"
  "github.com/hashicorp/terraform/helper/schema"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/aws/awserr"
- "github.com/awslabs/aws-sdk-go/service/autoscaling"
- "github.com/awslabs/aws-sdk-go/service/elb"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/aws/awserr"
+ "github.com/aws/aws-sdk-go/service/autoscaling"
+ "github.com/aws/aws-sdk-go/service/elb"
 )
 
 func resourceAwsAutoscalingGroup() *schema.Resource {
@@ -462,7 +462,7 @@ func waitForASGCapacity(d *schema.ResourceData, meta interface{}) error {
  return nil
  }
 
- return fmt.Errorf("Still need to wait for more healthy instances.")
+ return fmt.Errorf("Still need to wait for more healthy instances. This could mean instances failed to launch. See Scaling History for more information.")
  })
 }
 

diff --git a/builtin/providers/aws/resource_aws_autoscaling_group_test.go b/builtin/providers/aws/resource_aws_autoscaling_group_test.go
@@ -6,9 +6,9 @@ import (
  "strings"
  "testing"
 
- "github.com/awslabs/aws-sdk-go/aws"
- "github.com/awslabs/aws-sdk-go/aws/awserr"
- "github.com/awslabs/aws-sdk-go/service/autoscaling"
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/aws/awserr"
+ "github.com/aws/aws-sdk-go/service/autoscaling"
  "github.com/hashicorp/terraform/helper/resource"
  "github.com/hashicorp/terraform/terraform"
 )