Commit Graph

1495 Commits

Author SHA1 Message Date
Paul Hinze fb37b3515d Merge pull request #1712 from hashicorp/f-rename-elasticache-cluster
providers/aws: add _cluster to aws_elasticache
2015-05-01 20:07:19 -05:00
Josh Bleecher Snyder 745d83a995 providers: add template provider
Fixes #215.
2015-05-01 16:59:49 -07:00
Radek Simko 795d53e706 [bugfix] Don't save instance ID if association fails
- typically happens when no internet GW is available in VPC
2015-05-01 23:55:08 +01:00
Radek Simko 3d665ddfcf provider/aws: Add support for alias record to Route53 2015-05-01 22:43:04 +01:00
Christopher Tiwald f255fd8c42 aws: Add acceptance tests for aws_vpn_connection resources. 2015-05-01 12:23:16 -04:00
Christopher Tiwald 814403f45c aws: Add support for AWS VPN connections 2015-05-01 12:23:08 -04:00
Radek Simko bafabf17be provider/aws: Expose zone_id from elb 2015-05-01 08:07:33 +01:00
Dave Cunningham 85cc4ec0c1 Use a set for service account scopes. Fix #1759 2015-04-30 21:21:21 -04:00
Camilo Aguilar 338ae601bc providers/aws: Implements DHCP Options Set support. 2015-04-30 17:52:04 -04:00
Mitchell Hashimoto aaf94e7cec Merge pull request #1745 from hashicorp/b-openstack-bool
provider/openstack: enable_dhcp should be bool [GH-1741]
2015-04-30 14:27:14 -07:00
Paul Hinze 15b9bde1fe providers/aws: add _cluster to aws_elasticache
This AWS calls the actual resources "Cache Clusters" so it seems like
this name makes more sense.

Verified all Elasticache acc tests pass.
2015-04-30 16:12:08 -05:00
Paul Hinze a9de720a4e Merge pull request #1708 from hashicorp/f-elb-source-security-group
providers/aws: add source_security_group to elb
2015-04-30 16:10:02 -05:00
Clint 76e897fedb Merge pull request #1753 from hashicorp/f-aws-db-subnet-name
provider/aws: Fix refresh/plan issue with DB Param. Group name
2015-04-30 13:42:06 -05:00
Paul Hinze b99611fa44 provider/aws: allow key_pair name to be generated
As a module author, I'd like to be able to create a module that includes
a key_pair.  I don't care about the name, I only know I don't want it to
collide with anything else in the account.

This allows my module to be used multiple times in the same account
without having to do anything funky like adding a user-specified unique
name parameter.
2015-04-30 10:33:14 -05:00
Clint Shryock c006af9efe provider/aws: Fix refresh/plan issue with DB Param. Group name
Check against AWS with lowercase, but store in state unmodified.
2015-04-30 09:25:50 -05:00
TANABE Ken-ichi 53a7da379c provider/aws: Add acceptance tests for aws_proxy_protocol_policy 2015-04-30 17:56:46 +09:00
TANABE Ken-ichi 9df2bf68cb providers/aws: use isLoadBalancerNotFound 2015-04-30 17:56:46 +09:00
TANABE Ken-ichi 5c1dabdb69 provider/aws: Add ProxyProtocol support via aws_proxy_protocol_policy 2015-04-30 17:56:46 +09:00
Dave Cunningham f6554fb4a9 Support Google Cloud DNS, Fix #1148 2015-04-30 01:32:34 -04:00
Christopher Tiwald eb03f08454 aws: Add acceptance test for aws_customer_gateway. 2015-04-29 21:32:59 -04:00
Christopher Tiwald 2794a1c5ab aws: Add support for aws_customer_gateway 2015-04-29 21:32:51 -04:00
Mitchell Hashimoto 136402afe9 Merge pull request #1726 from skfmu/f-openstack-add-availability-zones
provider/openstack: Add availability zones for OpenStack block storage
2015-04-29 17:38:19 -07:00
Mitchell Hashimoto 914740f065 provider/openstack: enable_dhcp should be bool [GH-1741] 2015-04-29 17:30:58 -07:00
Mitchell Hashimoto 4bf9c26af0 Merge pull request #1740 from grosskur/alan-cloudflare-error-msg
providers/cloudflare: Better error message
2015-04-29 13:54:25 -07:00
Alan Grosskurth 023b2f94eb providers/cloudflare: Better error message
Currently, if a record isn't found, we get an error like:

    Couldn't find record: Record not found

This change improves the error message to add more context:

    Couldn't find record ID (123456789) for domain (example.com): Record not found
2015-04-29 13:49:16 -07:00
Clint daeaba5cd4 Merge pull request #1618 from hashicorp/b-aws-fix-vpc-security-id-update
provider/aws: Fix issue with updating VPC Security Group IDs for an Instance
2015-04-29 10:39:14 -05:00
Paul Hinze 950bd92837 Merge pull request #1633 from Banno/route53-zone-back-to-list
changing route53_zone.name_servers back to list
2015-04-29 10:38:59 -05:00
Clint Shryock 036d199dd6 provider/aws: Fix issue with updating VPC Security Group IDs for an Instance
Currently, we weren't correctly setting the ids, and are setting both
`security_groups` and `vpc_security_group_ids`. As a result, we really only use
the former.

We also don't actually update the latter in the `update` method.

This PR fixes both issues, correctly reading `security_groups` vs.
`vpc_security_group_ids` and allows users to update the latter without
destroying the Instance when in a VPC.
2015-04-29 10:03:57 -05:00
James Stremick e586d05a7d Remove some unecessary debug output I added 2015-04-29 10:21:28 -04:00
James Stremick 244639cf3d Remove some domain checking duplication 2015-04-29 10:21:28 -04:00
James Stremick b29e9d3b6f Allow assocation of EIP to ENI 2015-04-29 10:21:08 -04:00
Mitchell Hashimoto d66012969a Merge pull request #1658 from bitglue/ebs
provider/aws: Implement aws_ebs_volume
2015-04-28 20:37:26 -07:00
Mitchell Hashimoto 77f6945ae7 Merge pull request #1662 from jgjay/elb-sgs-update
provider/aws: update elb security groups in-place
2015-04-28 20:30:00 -07:00
Mitchell Hashimoto b45cd2830f Merge pull request #1682 from mzupan/master
provider/aws: Don't re-do a ASG on a grace healthcheck grace period change
2015-04-28 20:26:00 -07:00
Mitchell Hashimoto d354cae524 Merge pull request #1685 from ctiwald/master
provider/aws: Implement support for various AWS ELB cookie stickiness policies
2015-04-28 20:24:11 -07:00
Mitchell Hashimoto 57af67b314 Merge pull request #1718 from ravenac95/encrypted-ebs-volume-fix
provider/aws: Fix connecting encrypted ebs volumes to aws_instances
2015-04-28 20:21:12 -07:00
Reuven V. Gonzales e8e42decc9 Added docs about m3.medium to tests 2015-04-28 15:19:31 -07:00
Reuven V. Gonzales 25ab54b4e3 Added tests to check for encrypted flag 2015-04-28 15:07:23 -07:00
Reuven V. Gonzales 4ef6d468e9 Actually sends ebs encrypted flag 2015-04-28 10:54:30 -07:00
Phil Frost dcebff7108 Implement aws_ebs_volume
This resource allows the management of EBS volumes not associated with
any EC2 instance.
2015-04-28 12:54:02 -04:00
Sander van Harmelen 764bdbcac9 Merge pull request #1711 from jeroendekorte/b-cloudstack-aclrule
Provider/Cloudstack: Fixed the acl rules to support protocol all and icmp
2015-04-28 18:39:21 +02:00
Jeroen de Korte bf05734b9a Added some extra tests for the acl-rules 2015-04-28 18:17:02 +02:00
Jeroen de Korte 92128b48a8 Added support for protocol all and fixed the hash diff for icmp and all 2015-04-28 17:05:43 +02:00
Paul Hinze fc26f7a119 Merge pull request #1331 from tmtk75/dev/aws_ecache
provider/aws: resource ElastiCache
2015-04-28 10:00:25 -05:00
Paul Hinze e4e6ac5d91 providers/aws: add source_security_group to elb 2015-04-28 09:40:19 -05:00
Paul Hinze c748ce9c9e Merge pull request #1695 from aznashwan/commfix
Fixed/added docstrings in aws provider package.
2015-04-28 08:51:20 -05:00
Paul Hinze a6de57e5d3 Merge pull request #1687 from dainis/fix_gce_healthcheck_typo
Fix - typo in healthcheck names
2015-04-28 08:50:58 -05:00
Paul Hinze 4140253578 Merge pull request #1701 from hashicorp/b-cannot-retrieve-eip
provider/aws: fix EIPs on new upstream sdk
2015-04-28 08:50:39 -05:00
Justin Campbell 6f4b7b25c6 providers/dnsimple: default ttl to 3600
Since the field is optional and DNSimple defaults it to 3600 on their end, `terraform plan` currently will report `ttl: "3600" => ""`.
2015-04-28 09:20:23 -04:00
Paul Hinze 120cfdce59 provider/aws: fix EIPs on new upstream sdk
As we've seen elsewhere, the SDK now wants nils instead of empty arrays
for collections

fixes #1696

thanks @jstremick for pointing me in the right direction
2015-04-27 19:55:26 -05:00
aznashwan d64dd99d4d Fixed/added docstrings in aws provider package. 2015-04-27 21:06:49 +03:00
Dainis Tillers 2fa8403673 Fix - typo in healthcheck names 2015-04-27 11:42:50 +03:00
skfmu 2c32988743 Added availability zones for OpenStack block storage. 2015-04-27 05:52:45 +00:00
Christopher Tiwald 99ce8cf25e aws: Add acceptance test of aws_app_cookie_stickiness_policy. 2015-04-26 18:56:56 -04:00
Christopher Tiwald 0533d60195 aws: Add support for aws_app_cookie_stickiness_policy.
This resource represents a session stickiness policy in AWS, and can be
applied to an ELB's client-facing listeners.
2015-04-26 18:56:07 -04:00
Christopher Tiwald 448fb4895f aws: Add acceptance test of aws_lb_cookie_stickiness_policy. 2015-04-26 18:05:40 -04:00
Christopher Tiwald 0120899f2a aws: Add support for aws_lb_cookie_stickiness_policy.
This resource represents a session stickiness policy in AWS, and can be
applied to an ELB's client-facing listeners.
2015-04-26 18:05:37 -04:00
Mike Zupan 0177be2a66 need to update aws with the change if there is one 2015-04-25 20:00:04 -07:00
Mike Zupan 9fe6317348 don't need to create a new ASG for this change
Tested

```
aws_autoscaling_group.rabbit: Modifying...
  health_check_grace_period: "200" => "3000"
aws_autoscaling_group.rabbit: Modifications complete
```
2015-04-25 19:50:33 -07:00
Tomotaka Sakuma f3d9a287e1 support aws resource ElastiCache 2015-04-26 10:53:21 +09:00
Paul Hinze 37c693e8ce Merge pull request #1672 from PeopleNet/vpc_peering_tags
Fix for #1664. Apply AWS VPC Peering Conn. tags on create.
2015-04-25 09:37:28 -05:00
John Engelman c2fa397ec8 Fix for #1664. Apply AWS VPC Peering Conn. tags on create. 2015-04-24 16:12:20 -05:00
Trevor Pounds fe62312617 Fix comment typos. 2015-04-24 10:25:19 -07:00
Gavin James c986c65238 update security groups in-place 2015-04-23 20:57:37 +01:00
Henrik Hodne 769f456028 aws: add propagating_vgws to route tables 2015-04-23 15:03:45 +00:00
Luke Amdor fe2d9ea3cc sorting the name_server entries 2015-04-23 08:48:19 -05:00
Paul Hinze 10b73f95ae Merge pull request #1635 from hashicorp/b-net-acls-blank-id
providers/aws: network_acl, remove blank filter
2015-04-23 07:32:04 -05:00
Paul Hinze 69ef012dfc Merge pull request #1632 from hashicorp/f-generate-sg-names
unique identifier helper for resources / generate AWS security group names
2015-04-23 07:25:23 -05:00
Panagiotis Moustafellos 6bb8947d16 providers/aws: aws_elb incr. idle_timeout to 60s
per docs
http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/config-idle-timeout.html
2015-04-23 12:46:52 +03:00
Paul Hinze 6401635b97 providers/aws: network_acl, remove blank filter
The upstream behavior here changed, and the request needs a `nil`
instead of an empty slice to indicate that we _don't_ want to filter on
Network ACL IDs.

fixes #1634
2015-04-22 14:44:31 -05:00
Luke Amdor 6b5138328f changing route53_zone.name_servers back to list 2015-04-22 13:27:20 -05:00
Paul Hinze 079856620a provider/aws: set default SG description
because requiring a SG description is annoying
2015-04-22 13:27:20 -05:00
Paul Hinze 33de319293 provider/aws: allow SG names to be generated 2015-04-22 12:56:06 -05:00
Paul Hinze 94f703692c provider/aws: switch to helper for LC names 2015-04-22 12:53:47 -05:00
Mitchell Hashimoto c1464b1c6d Merge pull request #1623 from hashicorp/b-private-ip-ssh
providers/aws: if no public IP, use private IP for SSH by default
2015-04-22 16:02:04 +02:00
Mitchell Hashimoto 341b2ff864 Merge pull request #1625 from hashicorp/b-panic-network-acl
provider/aws: fix potential panic when finding network ACL
2015-04-22 16:01:57 +02:00
Mitchell Hashimoto f77f77f9f8 provider/aws: fix potential panic when finding network ACL 2015-04-22 12:39:01 +02:00
Mitchell Hashimoto 19b3fa1a76 provider/aws: allow int for network acl entry [GH-1435] 2015-04-22 12:35:23 +02:00
Mitchell Hashimoto ec38a65dda providers/aws: if no public IP, use private IP for SSH by default 2015-04-22 12:25:28 +02:00
Mitchell Hashimoto 8ca42f832e Merge pull request #1525 from Banno/route53-zone-nameservers
providers/aws: Expose Route53 zone nameservers for parent zone NS record
2015-04-22 12:10:27 +02:00
Mitchell Hashimoto 9037a3a4bc Merge pull request #1426 from dainis/master
provider/google: add additional options to google provider
2015-04-22 08:50:22 +02:00
Mitchell Hashimoto d02abb7a8c Merge pull request #1484 from sparkprime/deprecate-network
deprecate google instance 'network' attribute in favor of network_interface
2015-04-22 08:49:04 +02:00
Mitchell Hashimoto 11e6e89f73 provider/aws: make tests public and run them 2015-04-22 08:44:24 +02:00
Mitchell Hashimoto 78f9fb164b provider/aws: fix compilation errors 2015-04-22 08:42:44 +02:00
Mitchell Hashimoto 887f1b3d12 Merge branch 'elb-connection-settings' of https://github.com/jwaldrip/terraform into jwaldrip-elb-connection-settings 2015-04-22 08:38:19 +02:00
Mitchell Hashimoto 70a0579a12 Merge pull request #1578 from TimeIncOSS/route53-weighted-records
provider/aws: Add support for weighted Route53 records
2015-04-22 08:33:28 +02:00
Mitchell Hashimoto 2cecd586c2 Merge pull request #1619 from jgjay/elb-listener-update
provider/aws: handle changes to elb listeners after creation
2015-04-22 08:24:36 +02:00
Mitchell Hashimoto b755459ee3 Merge pull request #1358 from rzh/placement_group
provider/aws: support for AWS Placement Group
2015-04-22 08:20:43 +02:00
Mitchell Hashimoto 55f2a3659f Merge pull request #1550 from ggiamarchi/openstack/lb_vip_floatingip
Floating IP support for LBaaS Virtual IP
2015-04-22 08:17:50 +02:00
Mitchell Hashimoto 2996a25ce0 Merge pull request #1597 from aocsolutions/fix_sg_refresh
provider/aws: more careful with pointers
2015-04-22 08:12:43 +02:00
Mitchell Hashimoto 3176e5b44a Merge pull request #1595 from TimeIncOSS/aws-account-protection
aws: Allow defining blacklist/whitelist of account IDs
2015-04-22 08:08:01 +02:00
Gavin James 81079bb6ac handle addition/update/removal of listeners after creation 2015-04-21 23:17:17 +01:00
Clint Shryock 0c5011bea4 provider/aws: Fix issue with empty IPRanges 2015-04-21 10:57:50 -05:00
Mitchell Hashimoto c8a8f05935 Merge pull request #1601 from bitglue/sts_token
provider/aws: support session token in AWS credentials
2015-04-20 15:01:29 -07:00
Matt Good 21b0a03d70 Support for multiple providers of the same type
Adds an "alias" field to the provider which allows creating multiple instances
of a provider under different names. This provides support for configurations
such as multiple AWS providers for different regions. In each resource, the
provider can be set with the "provider" field.

(thanks to Cisco Cloud for their support)
2015-04-20 14:14:34 -07:00
Paul Hinze d55c8d8404 provider/docker: fmt on container resource 2015-04-20 14:18:46 -05:00
Phil Frost d4c8c528e0 Support session token in AWS credentials
Session tokens are necessary to utilize temporary credentials.
http://docs.aws.amazon.com/STS/latest/UsingSTS/Welcome.html
2015-04-20 15:09:04 -04:00
Paul Hinze 3ded884d95 provider/docker: guard against nil NetworkSettings 2015-04-20 12:42:36 -05:00
Stephan Epping c2319da1aa Add docker container network settings to output attribute 2015-04-20 12:41:35 -05:00
Nevins Bartolomeo 6da242de03 fixing sg refresh 2015-04-20 11:27:58 -04:00
Radek Simko 150fd00932 AWS account ID protection added 2015-04-20 12:07:39 +01:00
Mitchell Hashimoto 1c0f2f136c provider/aws: fix vet error, missing fmt param 2015-04-19 18:13:04 -07:00
Mitchell Hashimoto dda4ae6d12 Merge pull request #1555 from fatih/fix-eip-panic
providers/aws: check allocationId only if it's vpc, fixes #1345
2015-04-19 18:10:31 -07:00
Mitchell Hashimoto 2acc9b2e44 Merge pull request #1564 from nickryand/docker_links
Added Docker links support to the docker_container resource.
2015-04-18 16:41:17 -07:00
Mitchell Hashimoto 283a3af693 Merge pull request #1576 from bitglue/s3_refresh
provider/aws: refresh state for deleted s3 bucket correctly
2015-04-18 16:40:12 -07:00
Radek Simko 009514f0d3 Allow using deprecated security_groups in NI spec 2015-04-17 21:26:17 +01:00
Clint Shryock eda987dcfb provider/aws: Fix issue when creating ELB with no tags 2015-04-17 14:00:27 -05:00
Radek Simko 555f9dfab3 aws: Support for weighted Route53 records added
- closes #1155
2015-04-17 18:53:36 +01:00
Phil Frost 47e1ec85f1 Refresh state for deleted s3 bucket correctly
If reading an S3 bucket's state, and that bucket has been deleted, don't
fail with a 404 error. Instead, update the state to reflect that the
bucket does not exist. Fixes #1574.
2015-04-17 13:30:31 -04:00
duncan e1ac4b9f90 Add Elastic Network Interfaces as route destination
Fixes #938
2015-04-17 13:22:31 -04:00
Luke Amdor c3f9c12426 Merge remote-tracking branch 'refs/remotes/origin/master' into route53-zone-nameservers 2015-04-17 10:11:53 -05:00
Clint 0d1540d448 Merge pull request #1565 from hashicorp/f-aws-upstream-cleanup
F aws upstream cleanup
2015-04-17 08:55:11 -05:00
Paul Hinze a6325ad18c Merge pull request #1547 from sparkprime/user-agent
Add a UserAgent with version temporarily set to 0.0.0
2015-04-16 16:57:10 -05:00
Clint Shryock d27a41746c clean up tags sdk lib 2015-04-16 15:31:40 -05:00
Clint Shryock 3e6822ce08 more cleans ups of SDK reference 2015-04-16 15:28:18 -05:00
Clint Shryock 79fc8223bb consolidate structure.go 2015-04-16 15:18:01 -05:00
Clint Shryock ba43b7c963 mass search-replace of ec2SDKconn 2015-04-16 15:05:55 -05:00
Clint Shryock 331f6705b8 providers/aws: cleanup of connections, upgrades network acl test 2015-04-16 15:02:04 -05:00
Nick Downs f74405d5e7 Added Docker links support to the docker_container resource. 2015-04-16 12:42:21 -07:00
Clint Shryock c59bfd0ca5 Merge branch 'f-aws-upstream-s3'
* f-aws-upstream-s3:
  provider/aws: Conver AWS S3 to upstream sdk
2015-04-16 13:51:12 -05:00
Clint Shryock 1da9bc8f4c fix go formatting after rebase 2015-04-16 13:42:16 -05:00
Clint Shryock 1545dbb803 provider/aws: Convert Route 53 Zone, Record to upstream 2015-04-16 13:41:38 -05:00
Clint Shryock a5b2437dcf provider/aws: Convert Instance to use upstream library 2015-04-16 12:01:10 -05:00
Fatih Arslan 86810789c2 providers/aws: check allocationId only if it's vpc, fixes #1345
EIP with VPC only returns an allocationID. However, for standard we need
to lookup for PublicIP. When we use an example for standard EC2 instance
(here `t1.micro`):

```
resource "aws_instance" "example" {
    ami = "ami-25773a24"
    instance_type = "t1.micro"
}

resource "aws_eip" "ip" {
    instance = "${aws_instance.example.id}"
}

```

then in this case, allocationID will be nil, but publicIP will be non
nil (which is used later for association the IP).  So check for
allocationId only if it's of domain `VPC`.
2015-04-16 16:08:52 +03:00
Clint Shryock 7a99dd48b2 provider/aws: Convert Launch Configuration over to upstream
- removes extra ASG connection
2015-04-16 07:10:17 -05:00
Guillaume Giamarchi d855047af3 Floating IP support for LBaaS Virtual IP 2015-04-16 02:51:05 +02:00
Dave Cunningham e0905d89f8 Add a UserAgent with version temporarily set to 0.0.0 2015-04-15 18:17:21 -04:00
Luke Amdor f8b05fa05e using a set for route53 name_servers 2015-04-15 16:10:02 -05:00
Luke Amdor 46d3ab5ccd rename delegation_set_name_servers to name_servers 2015-04-15 16:07:50 -05:00
Clint Shryock 210b380d01 go vet updates 2015-04-15 15:32:20 -05:00
Clint Shryock 723be13f96 go fmt asg things 2015-04-15 15:30:35 -05:00
Clint Shryock 1f7d0944f1 provider/aws: Convert AWS ASG to upstream aws-sdk-go 2015-04-15 15:29:59 -05:00
Clint e97fd27b14 Merge pull request #1539 from hashicorp/f-aws-instance-vpc-sec-ids
provider/aws: Add support for separate VPC Security Group IDs attribute
2015-04-15 15:25:03 -05:00
Clint 334b157a5c Merge pull request #1510 from hashicorp/f-aws-upstream-rds-instance
provider/aws: Convert AWS RDS to use upstream aws-sdk-go
2015-04-15 15:23:52 -05:00
Clint Shryock 1ed2219493 don't capitalize IAM 2015-04-15 15:05:44 -05:00
Paul Hinze 9053cc3d18 Merge pull request #1537 from ggiamarchi/openstack/insecure_https
OpenStack - Allow to disable HTTPS certificate check
2015-04-15 15:03:26 -05:00
Clint Shryock df45b2cda8 go fmt db things 2015-04-15 15:02:52 -05:00
Guillaume Giamarchi b87c05e5a8 Allow to disable HTTPS certificate check 2015-04-15 21:54:44 +02:00
Clint Shryock 470379e7ed connection naming cleanups 2015-04-15 14:36:08 -05:00
Clint Shryock 9187cab6ac provider/aws: Convert remaining RDS resources to use upstream library 2015-04-15 14:31:53 -05:00
Clint Shryock d579b4b75c provider/aws: Convert AWS RDS to use upstream aws-sdk-go 2015-04-15 14:28:02 -05:00
Clint 220f62eb72 Merge pull request #1532 from hashicorp/f-aws-upstream-elb
providers/aws: Conver AWS ELB to upstream
2015-04-15 14:16:24 -05:00
Clint 5a815efdbb Merge pull request #1531 from hashicorp/f-aws-upstream-vpn-gateway
provider/aws: Convert VPN Gateway to upstream
2015-04-15 14:15:03 -05:00
Clint f948b6205a Merge pull request #1522 from hashicorp/f-aws-upstream-vpc-peering
provider/aws: Convert AWS VPC Peering to upstream
2015-04-15 14:14:02 -05:00
Clint Shryock 3337503eda update test and documentation for vpc ids in instances 2015-04-15 12:17:21 -05:00
Clint Shryock 97b98b1da6 Merge branch 'master' into f-aws-instance-vpc-sec-ids
* master: (511 commits)
  Update CHANGELOG.md
  core: avoid diff mismatch on NewRemoved fields during -/+
  Update CHANGELOG.md
  update CHANGELOG
  Fix minor error in index/count docs
  terraform: remove debug
  terraform: when pruning destroy, only match exact nodes, or exact counts
  up version for dev
  update CHANGELOG
  terraform: prune tainted destroys if no tainted in state [GH-1475]
  update CHANGELOG
  config/lang: support math on variables through implicits
  update CHANGELOG
  update cHANGELOG
  update cHANGELOG
  providers/aws: set id outside if/esle
  providers/aws: set ID after creation
  core: remove dead code from pre-deposed refactor
  website: update LC docs to note name is optional
  security_groups field expects a list of Security Group Group Names, not IDs
  ...
2015-04-15 12:12:17 -05:00
Paul Hinze 76701884cd Merge pull request #1517 from hashicorp/f-simplify-google-instance
google: simplify instance metadata schema
2015-04-15 11:48:37 -05:00
Paul Hinze 01e75e0fc3 google: simplify instance metadata schema
It doesn't need to be a List of Maps, it can just be a Map.

We're also safe to remove a previous workaround I stuck in there.

The config parsing is equivalent between a list of maps and a plain map,
so we just need a state migration to make this backwards compatible.
2015-04-15 11:01:35 -05:00
Clint Shryock dc54d6a852 refactor out a refresh fun that wasn't really used 2015-04-15 10:26:39 -05:00
Clint Shryock a3ffb6ea6e fix test failure 2015-04-15 09:43:43 -05:00