Commit Graph

1826 Commits

Author SHA1 Message Date
Radek Simko ce8351ddef provider/aws: Add FQDN as output to route53_record 2015-05-08 20:19:40 +01:00
Justin Campbell 870b48b1c0 Merge pull request #1865 from justincampbell/s3-region-zone
providers/aws: Add hosted_zone_id and region to attributes
2015-05-08 14:49:12 -04:00
Paul Hinze a28267b886 provider/aws: SG description should be ForceNew
Description cannot be handled in Update (there is no ModifySecurityGroup
API call), so we have to recreate to change the description.

Closes #1870
2015-05-08 12:16:54 -05:00
Sander van Harmelen d4150d5b1a Adding the tests... 2015-05-08 18:17:57 +02:00
Justin Campbell 73651e2c70 providers/aws: Extract normalizeRegion 2015-05-08 10:49:21 -04:00
Justin Campbell 445f92e48a providers/aws: Move HostedZoneIDForRegion into TF 2015-05-08 10:49:20 -04:00
Justin Campbell 64d2b495c3 providers/aws: Add region to S3 attrs 2015-05-08 10:02:16 -04:00
Justin Campbell 839688d477 providers/aws: Add hosted_zone_id to S3 attrs 2015-05-08 10:02:16 -04:00
Justin Campbell d7c9d8702c providers/aws: Extract website endpoint logic 2015-05-08 10:02:16 -04:00
Sander van Harmelen 4a99cf9e9f Small update/fix to properly clean ANSI going to the logfile... 2015-05-08 14:54:56 +02:00
Sander van Harmelen 60984b2da2 This commit adds a Chef Client provisioner
The commit is pretty complete and has a tested/working provisioner for
both SSH and WinRM. There are a few tests, but we maybe need another
few to have better coverage. Docs are also included…
2015-05-08 14:54:56 +02:00
Felix Rodriguez 60c3ca0430 typo 2015-05-07 23:21:47 +01:00
Clint Shryock 44461f49fd update structure test 2015-05-07 17:18:47 -05:00
Clint Shryock 70984526a4 Merge remote-tracking branch 'ctiwald/ct/fix-protocol-problem'
* ctiwald/ct/fix-protocol-problem:
  aws: Document the odd protocol = "-1" behavior in security groups.
  aws: Fixup structure_test to handle new expandIPPerms behavior.
  aws: Add security group acceptance tests for protocol -1 fixes.
  aws: error on expndIPPerms(...) if our ports and protocol conflict.
2015-05-07 17:13:21 -05:00
Clint 4874179e9a Merge pull request #1843 from ctiwald/ct/fix-network-acls
Fix a number of issues in AWS network ACLs
2015-05-07 16:39:10 -05:00
Mitchell Hashimoto ddad945717 provider/terraform: test fixture 2015-05-07 09:59:23 -07:00
Paul Hinze 1594cb3dbe provider/aws: remove names from LCs in ASG tests
Makes the tests a little more durable if your account happens to end up
with a dangling LC.
2015-05-07 10:14:49 -05:00
Clint Shryock 20ebb38b8f update s3bucket website tests 2015-05-07 10:13:08 -05:00
Clint ef62385a95 Merge pull request #1849 from hashicorp/f-aws-update-s3-website-tests
update tests so go vet is happy
2015-05-07 10:06:43 -05:00
Clint Shryock fed42fe1b3 update tests so go vet is happy 2015-05-07 10:03:28 -05:00
Paul Hinze 44e448b8c9 provider/docker: update image sha
Should eventually see if there's a way to rework this so it's less
brittle. But for now, we band-aid!
2015-05-07 09:50:16 -05:00
Paul Hinze 28875f49cd provider/heroku: fix config_vars in addons
These were never read properly - on Addons they show up as just a list
of var names, not a Map.

Fixes one issue in Addon acceptance tests.
2015-05-07 09:11:31 -05:00
Paul Hinze e7b101dba4 provider/aws: elasticache_cluster engine_version is computed
fixes the TestAccAWSElasticacheCluster test
2015-05-07 08:47:52 -05:00
Christopher Tiwald 9e8aefcd40 aws: Fix network ACL acceptance tests and add -1 protocol rule. 2015-05-06 23:54:14 -04:00
Christopher Tiwald 5b0d61727e aws: Only store protocol numbers for ingress/egress rules on ACLs.
Users can input a limited number of protocol names (e.g. "tcp") as
inputs to network ACL rules, but the API only supports valid protocol
number:

http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml

Preserve the convenience of protocol names and simultaneously support
numbers by only writing numbers to the state file. Also use numbers
when hashing the rules, to keep everything consistent.
2015-05-06 23:54:12 -04:00
Christopher Tiwald 8056b5f8f7 aws: Force users to use valid network masks on ACL ingress/egress
AWS will accept any overly-specific IP/mask combination, such as
10.1.2.2/24, but will store it by its implied network: 10.1.2.0/24.
This results in hashing errors, because the remote API will return
hashing results out of sync with the local configuration file.

Enforce a stricter API rule than AWS. Force users to use valid masks,
and run a quick calculation on their input to discover their intent.
2015-05-06 23:53:34 -04:00
Christopher Tiwald b888b31e08 aws: Force users to use from_port, to_port = 0 on network ACLs with -1 protocol
AWS doesn't store ports for -1 protocol rules, thus the read from the
API will always come up with a different hash. Force the user to make a
deliberate port choice when enabling -1 protocol rules. All from_port
and to_port's on these rules must be 0.
2015-05-06 23:51:23 -04:00
Christopher Tiwald d14049c8ad aws: Don't try to modify or delete the untouchable network_acl rules.
AWS includes default rules with all network ACL resources which cannot
be modified by the user. Don't attempt to store them locally or change
them remotely if they are already stored -- it'll consistently result
in hashing problems.
2015-05-06 23:03:25 -04:00
Christopher Tiwald 03ee059da3 aws: Write ingress/egress rules into a map so they can be set.
resourceAwsNetworkAclRead swallowed these errors resulting in rules
that never properly updated. Implement an entry-to-maplist function
that'll allow us to write something that Set knows how to read.
2015-05-06 23:03:24 -04:00
Paul Hinze a9678bd252 Merge pull request #1840 from hashicorp/f-aws-asg-handle-scaling-activity-in-progress-errors
provider/aws: handle in progress errs from ASG deletes
2015-05-06 19:39:23 -05:00
Paul Hinze 90907c8be5 Merge pull request #1738 from justincampbell/s3-website
providers/aws: S3 bucket website support
2015-05-06 19:37:29 -05:00
Paul Hinze 9a286402c3 Merge pull request #1838 from josharian/consul-scheme
providers/consul: add scheme argument
2015-05-06 19:09:11 -05:00
Paul Hinze 03530d1285 provider/aws: handle in progress errs from ASG deletes
If an AutoScalingGroup is in the middle of performing a Scaling
Activity, it cannot be deleted, and yields a ScalingActivityInProgress
error.

Retry the delete for up to 5m so we don't choke on this error. It's
telling us something's in progress, so we'll keep trying until the
scaling activity completed.
2015-05-06 18:54:59 -05:00
Paul Hinze 761523e8f9 Merge pull request #1839 from hashicorp/f-aws-asg-wait-for-capacity
provider/aws: wait for ASG capacity on creation
2015-05-06 18:40:13 -05:00
Paul Hinze 063454e9b8 provider/aws: wait for ASG capacity on creation
On ASG creation, waits for up to 10m for desired_capacity or min_size
healthy nodes to show up in the group before continuing.

With CBD and proper HealthCheck tuning, this allows us guarantee safe
ASG replacement.
2015-05-06 18:34:20 -05:00
Josh Bleecher Snyder 30d34908b7 providers/consul: add scheme argument
This enables connecting to consul over https
without having to set the envvar CONSUL_HTTP_SSL.
2015-05-06 16:12:32 -07:00
Clint c44ba73a2a Merge pull request #1837 from hashicorp/b-fix-aws-sg-vpcid
provider/aws: fix issue with reading VPC id in AWS Security Group
2015-05-06 17:01:20 -05:00
Clint Shryock 8705f0f78f provider/aws: fix issue with reading VPC id in AWS Security Group 2015-05-06 16:54:43 -05:00
Mitchell Hashimoto 4a61d0abc9 provider/aws: do connection draining stuff totally separate 2015-05-06 11:47:06 -07:00
Clint Shryock acbca8101c provider/aws: Update Elasticache Subnet test 2015-05-06 13:44:24 -05:00
Mitchell Hashimoto 5378d904a2 provider/aws: remove debug 2015-05-06 11:43:36 -07:00
Mitchell Hashimoto 74665f27c8 provider/aws: must set connection draining timeout separate frrom
enabled
2015-05-06 11:43:18 -07:00
Paul Hinze 300bc129a1 Merge pull request #1832 from hashicorp/b-google-instance-template-metadata
provider/google: compute template metadata to map
2015-05-06 13:18:38 -05:00
Mitchell Hashimoto 5d12c79d90 provider/aws: retry VGW connection a bit due to eventual consistency 2015-05-06 11:09:51 -07:00
Paul Hinze 75c8396f7a provider/google: compute template metadata to map
Needs to match instance, since shared processing helper functions are
used.

Closes #1665
2015-05-06 12:33:35 -05:00
Mitchell Hashimoto f2ddb53c8f provider/aws: only include network in hash if instance is not set 2015-05-06 10:32:17 -07:00
Mitchell Hashimoto 7311019efe provider/aws: fix incorrect test 2015-05-06 10:20:19 -07:00
Mitchell Hashimoto 4db68cee89 providers/aws: eip network interface is computed 2015-05-06 10:04:38 -07:00
Mitchell Hashimoto 37c56d0084 provider/aws: fix alias test 2015-05-06 09:55:14 -07:00
Clint Shryock 4e717829f8 Merge branch 'master' of github.com:hashicorp/terraform
* 'master' of github.com:hashicorp/terraform:
  provider/aws: detach VPN gateway with proper ID
  update CHANGELOG
  provider/aws: Update ARN in instanceProfileReadResult
  provider/aws: remove placement_group from acctest
  core: module targeting
  Added support for more complexly images repos such as images on a private registry that are stored as namespace/name
2015-05-06 11:45:35 -05:00
Mitchell Hashimoto b184e283b9 provider/aws: detach VPN gateway with proper ID 2015-05-06 09:45:08 -07:00
Clint Shryock cd90648d4e provider/aws: Fix acceptance issue with Network Acls 2015-05-06 11:44:09 -05:00
Mitchell Hashimoto d8485ef506 Merge pull request #1818 from jwthomp/feature/image_name_parse
providers/docker: Support for more complexly named image repos
2015-05-06 09:02:41 -07:00
TANABE Ken-ichi 5be4ecdcdb provider/aws: Update ARN in instanceProfileReadResult 2015-05-07 00:26:57 +09:00
Paul Hinze 010a39a58e provider/aws: remove placement_group from acctest
Depends on there being an existing placement group in the account called
"terraform-placement-group" - we'll need to circle back around to cover
this with AccTests after TF gets an `aws_placement_group` resource.
2015-05-06 10:13:24 -05:00
Clint Shryock 34609c6c22 provider/aws: Change Route 53 record test name, so it can be ran individually 2015-05-06 09:48:15 -05:00
Paul Hinze 66fa633b80 provider/aws: move EBS test into us-west-2 2015-05-06 09:22:34 -05:00
Paul Hinze bcb4067cb3 provider/aws: update test name 2015-05-06 09:20:40 -05:00
Paul Hinze 7303568469 providers/aws: update test name 2015-05-06 09:18:41 -05:00
Paul Hinze b91796368f provider/aws: update test name 2015-05-06 09:18:00 -05:00
Justin Campbell 2745adba56 providers/aws: Test S3 website endpoint attr 2015-05-06 09:41:02 -04:00
Justin Campbell 87e6d3d17f providers/aws: Fix S3 website error doc 2015-05-06 09:41:02 -04:00
Justin Campbell 0b78a71ed5 providers/aws: Test S3 website removal 2015-05-06 09:41:02 -04:00
Justin Campbell eeb65b8d4c providers/aws: Read S3 website config 2015-05-06 09:41:02 -04:00
Paul Hinze 6c6eafa232 provider/aws: removing stray "Ecache" in tests 2015-05-06 08:33:05 -05:00
Justin Campbell 20e531ae0d providers/aws: Check that S3 website sets docs 2015-05-06 08:15:56 -04:00
Justin Campbell be84cf8a8c providers/aws: Add note for us-east-1 empty location 2015-05-06 08:15:56 -04:00
Justin Campbell 348942d3fb providers/aws: Use GetOk instead of Get + cast 2015-05-06 08:15:56 -04:00
Justin Campbell 562bd6541b providers/aws: Use explicit returns in websiteEndpoint 2015-05-06 08:15:56 -04:00
Justin Campbell 30f737c781 providers/aws: Change S3 website to block 2015-05-06 08:15:56 -04:00
Justin Campbell 38e04b3765 providers/aws: Add website_endpoint to S3 output 2015-05-06 08:15:55 -04:00
Justin Campbell b7a9ef5ef6 providers/aws: Add S3 error_document
Also fix when index/error document is empty
2015-05-06 08:15:55 -04:00
Justin Campbell e6d9dcfb1a providers/aws: Initial S3 bucket website support 2015-05-06 08:15:55 -04:00
Joe Topjian b54df9bc0b Fixing TestAccComputeV2FloatingIP_attach 2015-05-06 05:58:58 +00:00
Joe Topjian 219c86ef93 Fixing TestAccComputeV2Instance_floatingIPAttach 2015-05-06 05:53:17 +00:00
Joe Topjian e76dca9756 Fixing TestAccComputeV2Instance_basic 2015-05-06 05:50:21 +00:00
Paul Hinze cebcee5c63 Merge pull request #1778 from josharian/template-provider
providers: add template provider
2015-05-05 20:09:27 -05:00
Mitchell Hashimoto 1a2bac7645 provider/aws: main route table refresh handles VPC being gone [GH-1806] 2015-05-05 18:07:22 -07:00
Jeff Thompson 8e53355ff3 Added support for more complexly images repos such as images on a private registry that are stored as namespace/name 2015-05-05 23:22:09 +00:00
Clint Shryock 885efa0837 provider/aws: Add Security Group Rule as a top level resource
- document conflict with sg rules and sg in-line rules
- for this to work, ingress rules need to be computed
2015-05-05 16:56:39 -05:00
Clint a4000941c2 Merge pull request #1765 from hashicorp/f-aws-security-group-remove-default-egress
provider/aws: Remove default egress rule from Security Group on creation
2015-05-05 16:47:23 -05:00
Mitchell Hashimoto fb4ac42c65 Merge pull request #1516 from henrikhodne/aws-propagating-vgws
provider/aws: add propagating_vgws to route tables
2015-05-05 14:42:45 -07:00
Clint Shryock eb7c1bb218 fix go formatting 2015-05-05 16:42:08 -05:00
Clint Shryock e9b08cf31f revert the required part 2015-05-05 16:23:26 -05:00
Clint Shryock 1ed81da9a9 update ENI test for SG egress constraint 2015-05-05 16:23:26 -05:00
Clint Shryock 85b1756c27 revise tests and check for vpc_id 2015-05-05 16:23:26 -05:00
Clint Shryock 8ded3c2d1b Move block for deleing default rule into the create method; only invoke once 2015-05-05 16:23:26 -05:00
Clint Shryock ee65684abe Add spec for removing default egress rule 2015-05-05 16:23:26 -05:00
Clint Shryock b145ce88b7 Document Egress+VPC change, update link 2015-05-05 16:23:26 -05:00
Clint Shryock 1558fd1c3e provider/aws: Remove default egress rule from Security Group on creation 2015-05-05 16:23:25 -05:00
Mitchell Hashimoto 412a2dca0b Merge pull request #1575 from freshbooks/aws-eni-route
provider/aws: Add Elastic Network Interfaces as route destination
2015-05-05 13:28:48 -07:00
Mitchell Hashimoto 1c2d5fbd0a Merge branch 'f-aws-associate-eip-to-eni' of https://github.com/jstremick/terraform into jstremick-f-aws-associate-eip-to-eni 2015-05-05 13:24:50 -07:00
Clint 18b43b78cb Merge pull request #939 from bitglue/iam
Implement a subset of IAM resources
2015-05-05 15:05:05 -05:00
Clint Shryock 7b082d007e Merge commit '33183c0'
* commit '33183c0':
  Implement a hash function for string sets
2015-05-05 15:01:02 -05:00
Mitchell Hashimoto 7a5499d4f7 providers/aws: chain credentials 2015-05-05 10:44:19 -07:00
Mitchell Hashimoto 639f310ae6 Merge pull request #1805 from dupuy/openstack-resource-docs
Openstack resource docs
2015-05-05 10:25:30 -07:00
John Engelman 6ee17a8e9e Add acceptance tests 2015-05-05 12:47:20 -04:00
Phil Frost b082117e92 Implement AWS IAM resources
- Users
- Groups
- Roles
- Inline policies for the above three
- Instance profiles
- Managed policies
- Access keys

This is most of the data types provided by IAM. There are a few things
missing, but the functionality here is probably sufficient for 95% of
the cases. Makes a dent in #28.
2015-05-05 12:47:20 -04:00
Phil Frost 33183c078b Implement a hash function for string sets
Sets of strings are pretty common. Let's not duplicate the function
necessary to create a set of strings in so many places.
2015-05-05 12:47:18 -04:00
Clint Shryock 272415303d provider/aws: Shorting retry timeout for Subnets to 2 minutes, from 5 2015-05-05 11:20:29 -05:00
Clint Shryock 3ce3b7c516 provider/aws: Shorting retry timeout for Security Groups to 2 minutes, from 5 2015-05-05 11:07:16 -05:00
Clint Shryock 4b160dd28e minor cleanups 2015-05-05 10:45:30 -05:00
jba c50bcf2930 renaming function according to the aws struct 2015-05-05 10:39:25 -05:00
jba e9215c0676 move accept block to the update func 2015-05-05 10:38:20 -05:00
jba 5658fd6122 clean code 2015-05-05 10:37:13 -05:00
jba 11ba9b1042 add the auto_accecpt option 2015-05-05 10:37:13 -05:00
Alexander Dupuy 2ccaaf204d fix copy/paste typo in OpenStack FW error messages 2015-05-05 14:01:49 +02:00
Sander van Harmelen 44541c5465 Fixing up some tests after a couple of thorough test rounds 2015-05-05 12:31:21 +02:00
Avi Nanhkoesingh 1411d4010f Fixes #1: sets the rights values based on isUUID 2015-05-05 12:31:21 +02:00
Sander van Harmelen 7274de3c1d Small fix needed to be inline with the updated AWS SDK again...
Executed a couple of AWS ACC test as well to make sure everything works
properly again after this fix…
2015-05-05 12:26:26 +02:00
Christopher Tiwald 69e981c0b0 aws: Fixup structure_test to handle new expandIPPerms behavior. 2015-05-04 23:56:54 -04:00
Christopher Tiwald 362a6124e3 aws: Add security group acceptance tests for protocol -1 fixes.
These only test ingress rules as egress rules are broken by the
default "0.0.0.0/0" rule Amazon includes with every egressed security
group.
2015-05-04 23:55:32 -04:00
Christopher Tiwald 89bacc0b15 aws: error on expndIPPerms(...) if our ports and protocol conflict.
Ingress and egress rules given a "-1" protocol don't have ports when
Read out of AWS. This results in hashing problems, as a local
config file might contain port declarations AWS can't ever return.

Rather than making ports optional fields, which carries with it a huge
headache trying to distinguish between zero-value attributes (e.g.
'to_port = 0') and attributes that are simply omitted, simply force the
user to opt-in when using the "-1" protocol. If they choose to use it,
they must now specify "0" for both to_port and from_port. Any other
configuration will error.
2015-05-04 23:43:31 -04:00
Clint Shryock 81422123e8 provider/aws: Add a regression check for Route 53 records 2015-05-04 17:05:49 -05:00
Mitchell Hashimoto 9ed909c8fe Merge pull request #1749 from nabeken/aws-proxy-protocol-policy
provider/aws: Add proxy protocol support in ELB
2015-05-04 14:04:53 -07:00
Mitchell Hashimoto 8633c88723 Merge pull request #1775 from TimeIncOSS/r53-alias-record
aws: Add support for Alias records into AWS Route 53
2015-05-04 14:03:29 -07:00
Mitchell Hashimoto c8c0b02790 Merge pull request #1787 from koendc/f-aws-max-retries
aws: make MaxRetries for API calls configurable
2015-05-04 14:00:37 -07:00
Mitchell Hashimoto 2c90d3a637 Merge pull request #1793 from ctiwald/ct/add-vpn-connection-route
provider/aws: add support for VPN connection routes
2015-05-04 13:58:17 -07:00
Mitchell Hashimoto 9617761eb4 Merge pull request #1776 from TimeIncOSS/eip-without-igw
[bugfix] aws/eip: Don't save instance ID if association fails
2015-05-04 11:19:32 -07:00
Mitchell Hashimoto cf6fa89f46 Merge pull request #1785 from koendc/f-aws-security-token
aws: re-introduce support for AWS_SECURITY_TOKEN
2015-05-04 11:18:28 -07:00
Josh Bleecher Snyder 76bcac3031 providers/template: add tests, address review comments
Do directory expansion on filenames.

Add basic acceptance tests. Code coverage is 72.5%.
Uncovered code is uninteresting and/or impossible error cases.

Note that this required adding a knob to
helper/resource.TestStep to allow transient
resources.
2015-05-04 10:26:17 -07:00
Christopher Tiwald 2c21f248ad aws: Add acceptance tests for VPN connection routes. 2015-05-04 12:55:55 -04:00
Christopher Tiwald e7f8883929 aws: Add support for VPN connection routes. 2015-05-04 12:20:42 -04:00
Christopher Tiwald 4727260987 aws: fix VPN connection acceptance test.
This corrects syntactical errors and uses distinct IP addresses for
each configuration.
2015-05-04 11:34:35 -04:00
Christopher Tiwald 47305c9c5d aws: Fix customer gateway acceptance test.
This test contained a few syntactical errors.
2015-05-04 11:34:35 -04:00
Christopher Tiwald f31466a60e aws: Fix app cookie stickiness policy acceptance test.
This used the wrong AZ and contained a few syntactical errors in
configuration.
2015-05-04 11:34:35 -04:00
Christopher Tiwald 14ea3a33a4 aws: Fix LB cookie stickiness policy acceptance test.
This needs to run in us-west-2 and contained a few syntactical errors
that prevented it from working.
2015-05-04 11:34:34 -04:00
Koen De Causmaecker 398c22adcd aws: make MaxRetries for API calls configurable
- Make it configurable in the AWS provider by add an option
  'max_retries'.
- Set the default from 3 to 11 retries.
2015-05-03 15:35:51 +02:00
Koen De Causmaecker c8f32a2711 aws: re-introduce support for AWS_SECURITY_TOKEN 2015-05-03 10:26:58 +02:00
Dave Cunningham cc7f4edd27 Merge pull request #1764 from sparkprime/scopes-pr
Use a set for service account scopes.  Fix #1759
2015-05-01 22:31:12 -04:00
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
Paul Hinze 199dabaf75 Merge pull request #1772 from ctiwald/ct/add-vpn-connection
Add support for AWS VPN connections.
2015-05-01 19:39:10 -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
Sander van Harmelen 41748003c0 Updated the PR according to the review comments
* We now return an error when you set the script_path to
C:\Windows\Temp explaining this is currently not supported
* The fix in PR #1588 is converted to the updated setup in this PR
including the unit tests

Last thing to do is add a few tests for the WinRM communicator…
2015-05-01 18:52:01 +02:00
Sander van Harmelen 4a29c714e5 Adding support for WinRM 2015-05-01 18:48:54 +02:00
Sander van Harmelen b1c6a3f63f Few small fixes to make the last tests also pass
The reason why the shebang is removed from these tests, is because the
shebang is only needed for SSH/Linux connections. So in the new setup
the shebang line is added in the SSH communicator instead of in the
resource provisioner itself…
2015-05-01 18:48:54 +02:00
Sander van Harmelen c9e9e374bb Adding some abstractions for the communicators
This is needed as preperation for adding WinRM support. There is still
one error in the tests which needs another look, but other than that it
seems like were now ready to start working on the WinRM part…
2015-05-01 18:48:54 +02: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
Mitchell Hashimoto ccd14a6fcc Merge pull request #1588 from hashicorp/b-par-prov
helper/ssh: add random number to upload path for script [GH-1545]
2015-04-20 10:22:33 -07: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
Mitchell Hashimoto de8666a5fa helper/ssh: add random number to script [GH-1545] 2015-04-18 16:09:08 -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 3f66e480cc provisioner/file: expand ~ in source
closes #1559

tested manually, since a unit test would be sort of annoying to write.
:)
2015-04-16 18:53:04 -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
Clint Shryock 7078753733 Merge branch 'master' into f-aws-upstream-elb
* master:
  Update CHANGELOG.md
  core: avoid diff mismatch on NewRemoved fields during -/+
2015-04-15 09:34:28 -05:00
Paul Hinze 6365b3af89 Merge pull request #1515 from hashicorp/b-diff-mismatch-on-instance-replacement
core: avoid diff mismatch on NewRemoved fields during -/+
2015-04-14 17:44:28 -05:00
Paul Hinze 64f0897c82 core: avoid diff mismatch on NewRemoved fields during -/+
fixes #1508

In a DESTROY/CREATE scenario, the plan diff will be run against the
state of the old instance, while the apply diff will be run against an
empty state (because the state is cleared when the destroy node does its
thing.)

For complex attributes, this can result in keys that seem to disappear
between the two diffs, when in reality everything is working just fine.

Same() needs to take into account this scenario by analyzing NewRemoved
and treating as "Same" a diff that does indeed have that key removed.
2015-04-14 17:23:30 -05:00
Luke Amdor b763294926 fixing string format 2015-04-14 16:51:58 -05:00
Clint Shryock 4186ec18c6 providers/aws: Conver AWS ELB to upstream 2015-04-14 16:41:36 -05:00
Clint Shryock 900dd4e151 provider/aws: Convert VPN Gateway to upstream 2015-04-14 15:45:48 -05:00
Luke Amdor eb43822f68 err-check the resource set 2015-04-14 14:54:38 -05:00
Luke Amdor 8f1acaf026 expose Route53 zone name servers 2015-04-14 14:17:01 -05:00
Clint Shryock 95026b6266 provider/aws: Convert AWS VPC Peering to upstream 2015-04-14 11:23:26 -05:00
Clint Shryock d4e7c2dedc provider/aws: Conver AWS S3 to upstream sdk 2015-04-14 11:07:05 -05:00
Mitchell Hashimoto 710d1113eb Merge pull request #1490 from jtopjian/openstack-allow-blank-region
provider/openstack: Allow Blank Region
2015-04-14 08:28:03 -07:00
Mitchell Hashimoto 0eb69bcd37 Merge pull request #1518 from hashicorp/b-lc-id
providers/aws: set LC ID after creation
2015-04-14 08:23:31 -07:00