Commit Graph

9231 Commits

Author SHA1 Message Date
Paul Hinze b8b10c9345 Update CHANGELOG.md 2016-03-10 15:44:38 -06:00
Paul Hinze 82765ea589 Merge pull request #5453 from bigkraig/aws-s3-kms-key
provider/aws: Support KMS encryption of S3 objects
2016-03-10 15:44:10 -06:00
Paul Hinze 5ce68fd1bd Merge pull request #5571 from hashicorp/revert-5193-f-aws-instance-security-groups-updates
Revert "provider/aws: Support additional changes to security groups of instance without forcing new"
2016-03-10 15:09:16 -06:00
Clint 7c58f145fd Merge pull request #5570 from hashicorp/b-aws-acc-test-updates
provider/aws: More Acc test updates
2016-03-10 15:04:33 -06:00
Paul Hinze e9c4d4f6d5 Revert "provider/aws: Support additional changes to security groups of instance without forcing new" 2016-03-10 14:51:30 -06:00
clint shryock 02ba1bf2d4 provider/aws: More Acc test updates
Working on the green

- randomize some Autoscaling lifecycle hook test names
- use vpc_security_group_ids for this test
2016-03-10 14:33:54 -06:00
Lars Wander e0d489f086 Update CHANGELOG.md 2016-03-10 14:50:34 -05:00
Lars Wander bac9385cac Update CHANGELOG.md 2016-03-10 14:39:18 -05:00
Lars Wander 0254f95cc9 Merge pull request #5564 from lwander/b-gcp-route-network
provider/google: Mark next_hop_network as read only.
2016-03-10 14:38:08 -05:00
Paul Hinze 914fd487c8 Update CHANGELOG.md 2016-03-10 13:31:15 -06:00
Paul Hinze 4e9e0ec5ca Merge pull request #5563 from hashicorp/phinze/deprecate-template-path
provider/template: warn when template specified as path
2016-03-10 13:30:23 -06:00
Paul Hinze e6a62d0a5c Update CHANGELOG.md 2016-03-10 13:19:04 -06:00
Paul Hinze ad0836be6f Merge pull request #5516 from hashicorp/phinze/tainted-target-bug
core: Encode Targets in saved Planfile
2016-03-10 13:16:19 -06:00
Lars Wander f8784df82b provider/google: Mark next_hop_network as read only. 2016-03-10 13:58:09 -05:00
Paul Hinze 0036db8f82 provider/template: warn when template specified as path
Turns out the BC code allowed users to move from `filename` to
`template` to squash the warning without having to switch from template
paths to template contents.

Here we warn when `template` is specified as a path so we can remove the
functionality in the future and remove this source of confusion.

refs #3732
2016-03-10 12:34:56 -06:00
Martin Atkins 01b3e215d7 Update CHANGELOG.md 2016-03-10 08:04:17 -08:00
Martin Atkins ec87a1b260 Merge pull request #5210 from apparentlymart/consul-keys-revamp
Make consul_keys behavior less surprising
2016-03-10 08:02:20 -08:00
Martin Atkins 2e33f5311c Treat each consul key as having its own lifecycle
Previously this resource managed the set of keys as a whole rather than
the individual keys, and so it was unable to recognize when a particular
managed key is removed and delete just that one key from Consul.

Here this is addressed by recognizing that each key actually has its own
lifecycle, and detecting when individual keys are added and removed
without replacing the entire consul_keys instance.

Additionally this restores the behavior of updating the "value" attribute
on read, but restricts it only to blocks that already had a value so as
to avoid the quirkiness seen previously when we updated blocks that were
intended to be read-only. Updating the value is important now, because we
rely on this to detect and repair discrepancies between values stored in
Consul and values given in the configuration.

This change produces a change in the handling of the "delete" attribute.
Before it was considered only when the entire consul_keys resource was
deleted, but now it is considered also when a particular key block is
removed from within a resource.
2016-03-10 07:52:43 -08:00
Martin Atkins df2ce588bc Specialized client for interacting with Consul keys
This deals with some of the quirks of interacting with the Consul API,
with the goal of making the consul_keys resource implementation, and
later the consul_keys data source, less noisy to read.
2016-03-10 07:51:27 -08:00
Clint 99ddea503d Merge pull request #5495 from nicolai86/bugfix/aws_security_group-protocol-case-sensitivity
provider/aws Always transform aws_security_group protocol to lower case
2016-03-10 09:34:55 -06:00
Clint 5b6637e607 Merge pull request #5512 from serbaut/cs-vpc-domain
provider/cloudstack docs: add vpc.network_domain
2016-03-10 09:26:42 -06:00
Clint eb7f821213 Update CHANGELOG.md 2016-03-10 08:57:16 -06:00
Clint 239b3e4f5f Merge pull request #5533 from hashicorp/pr-5184
provider/aws: Fix EC2 Classic SG Rule issue
2016-03-10 08:56:29 -06:00
Paul Hinze 0b9537b942 Update CHANGELOG.md 2016-03-10 08:30:55 -06:00
Paul Hinze cadd0c5767 Merge pull request #5553 from TimeIncOSS/b-fix-retry-err-bug
helper/resource: Error shouldn't be returned in case of success
2016-03-10 08:28:56 -06:00
Radek Simko 034287fdc2 helper/resource: Error shouldn't be returned in case of success 2016-03-10 14:14:14 +00:00
Radek Simko 8582f4df9f helper/resource: Fix TestRetry 2016-03-10 14:13:23 +00:00
James Nugent 2dc1c022d3 Merge pull request #5548 from afomi/minor-spelling
docs: fix spelling
2016-03-10 04:02:59 +00:00
Kraig Amador 76b3c74a58 Providing a more informative error message when combining kms_key_id and etag as well as using aws_kms_key to test aws_s3_bucket's kms_key_id. 2016-03-09 19:06:36 -08:00
Ryan Wold 1d3ba5b2ef fix spelling 2016-03-09 17:10:16 -08:00
Paul Hinze 3508ff9bd2 Update CHANGELOG.md 2016-03-09 18:55:44 -06:00
Paul Hinze 5ece31dc88 Merge pull request #5501 from evandbrown/vpnval
provider/google: Validate VPN tunnel peer_ip
2016-03-09 18:55:10 -06:00
Paul Hinze c1f8dda863 Merge pull request #5497 from evandbrown/flakeygcs
provider/google: Address flaky GCS acceptance tests.
2016-03-09 18:48:44 -06:00
Paul Hinze 5abc514434 Update CHANGELOG.md 2016-03-09 18:31:00 -06:00
Paul Hinze d12944797a Merge pull request #3928 from TimeIncOSS/aws-kms
provider/aws: Add support for KMS
2016-03-09 18:30:06 -06:00
Paul Hinze f691b89b05 Update CHANGELOG.md 2016-03-09 18:18:04 -06:00
Paul Hinze f8c6781982 Merge pull request #5543 from hashicorp/phinze/retryerror-pointers-are-evil
builtin: Refactor resource.Retry to clarify return
2016-03-09 18:15:51 -06:00
Pablo Porto b3ecf8eb73 Fix missing double quotes in postgresql_database resource 2016-03-09 23:42:59 +00:00
Paul Hinze 108ccf0007 builtin: Refactor resource.Retry to clarify return
Change the `RetryFunc` from a plain `error` return type to a
specialized `RetryError` which must decide whether it is
retryable or not.

Add `RetryableError` / `NonRetryableError` factory functions that
callers are meant to use to build up these errors.

This makes it eminently clear whether or not a given error is
retryable from inside the client code.

Goal here is to _not_ change any behavior, simply reflect the
existing behavior with the new, clearer, API.
2016-03-09 17:37:56 -06:00
Paul Stack a9fd7b4f1a Update CHANGELOG.md 2016-03-10 00:29:55 +01:00
Paul Stack ab075bca60 Merge pull request #5193 from innossh/f-aws-instance-security-groups-updates
provider/aws: Support additional changes to security groups of instance without forcing new
2016-03-10 00:28:32 +01:00
Paul Stack 18df66176a Merge pull request #5546 from ricardclau/add_vsphere_folder_in_layout
Documentation: Link to vsphere_folder resource missing in vsphere provider layout
2016-03-10 00:27:09 +01:00
James Nugent 4ba230c56e Update CHANGELOG.md 2016-03-09 23:26:36 +00:00
James Nugent 7436cf7f89 Merge pull request #5376 from stack72/b-aws-ELBListner
provider/aws: Fixes the use of Uppercase chars in ELB Listeners
2016-03-09 23:18:56 +00:00
Ricard Clau 8e486985d3 vsphere_folder resource missing in vsphere provider layout 2016-03-09 23:16:12 +00:00
Paul Hinze ffa5db4f52 Merge pull request #5538 from hashicorp/phinze/retryerror-pointers-are-evil
provider/aws: Fix all pointer RetryError returns
2016-03-09 16:53:19 -06:00
Paul Stack a4c8d869d3 Update CHANGELOG.md 2016-03-09 23:30:27 +01:00
stack72 c5ea6d0fb9 Merge branch 'BSick7-b/4311' 2016-03-09 23:27:38 +01:00
Brad Sickles 3f41515d2b Fixing noop differences in aws_route. 2016-03-09 23:27:09 +01:00
Brad Sickles 16f94ed4b7 Added failing aws_route test that shows diff after apply. 2016-03-09 23:27:09 +01:00