Commit Graph

2962 Commits

Author SHA1 Message Date
Mitchell Hashimoto 08813e6571 Merge branch 'add-ig-tags' of https://github.com/robzienert/terraform into robzienert-add-ig-tags
Conflicts:
	builtin/providers/aws/resource_aws_internet_gateway_test.go
2015-01-10 15:28:14 -08:00
Mitchell Hashimoto d1cae92a62 Update Makefile 2015-01-10 15:24:38 -08:00
Mitchell Hashimoto 6fde788dec Merge pull request #702 from svanharmelen/f-fix-makefile-for-go1.4
Update Makefile for use with Go 1.4
2015-01-10 15:23:40 -08:00
Mitchell Hashimoto 0046fcf756 Merge pull request #765 from phinze/fix-aws-db-instance-tests
provider/aws: fix aws_db_instance acceptance tests
2015-01-10 15:22:14 -08:00
Mitchell Hashimoto 12d20a8d52 Merge pull request #764 from hashicorp/f-schema-typed-readers
Refactor of helper/schema to prepare for better state formats
2015-01-10 15:21:33 -08:00
Paul Hinze f800441fe1 provider/aws: fix aws_db_instance acceptance tests
- 5.6.17 is no longer a valid mysql engine version, bumping to 5.6.21
- updating security_group_names assertion to match new set structure
  introduce in #663
2015-01-10 15:55:08 -06:00
Mitchell Hashimoto 3cbcafe989 helper/schema: remove unused field 2015-01-10 12:50:53 -08:00
Mitchell Hashimoto 361d00347a helper/schema: refactor tests for fieldreader to be common 2015-01-10 12:42:15 -08:00
Mitchell Hashimoto 9ab128899a helper/schema: make the getSource enum easier 2015-01-10 12:25:34 -08:00
Mitchell Hashimoto d89446391a helper/schema: make the get API cleaner 2015-01-10 12:22:05 -08:00
Mitchell Hashimoto 3c1b55a75f helper/schema: use the field reader/writer for state 2015-01-10 12:18:32 -08:00
Mitchell Hashimoto f64b09a045 helper/schema: more tests 2015-01-10 11:49:37 -08:00
Mitchell Hashimoto e77b2b17c4 helper/schema: remove unused method 2015-01-10 11:46:09 -08:00
Mitchell Hashimoto 03c6453a72 helper/schema: FieldWriter, replace Set 2015-01-10 11:44:26 -08:00
Mitchell Hashimoto e9a4aaaca7 helper/schema: full object test for addrToSchema 2015-01-09 17:43:44 -08:00
Mitchell Hashimoto e57f3f69b1 helper/schema: empty maps, support reading objects directly 2015-01-09 15:07:02 -08:00
Mitchell Hashimoto f0af1c36f5 helper/schema: nested resource fields should be zero-valued on get 2015-01-09 11:51:29 -08:00
Mitchell Hashimoto 942a988ac2 helper/schema: zero value of a set should be a set 2015-01-08 18:48:03 -08:00
Mitchell Hashimoto b4bf813151 helper/schema: too big to fail 2015-01-08 18:02:19 -08:00
Mitchell Hashimoto aa82c10e39 Merge pull request #762 from atlassian/fix_count_example
example: fix invalid mixing of hcl and json
2015-01-08 16:45:04 -08:00
Otto Jongerius fbfbccb895 fix invalid mixing of hcl and json 2015-01-09 11:43:29 +11:00
Mitchell Hashimoto 17201130ff Merge pull request #761 from justinclayton/patch-2
Clarify re: Openstack support
2015-01-08 16:14:34 -08:00
Justin Clayton 3e722d13ee Clarify re: Openstack support
This is a reword of #760 at @mitchellh 's request.
2015-01-08 15:58:56 -08:00
Mitchell Hashimoto 864a8f24ec helper/schema: GoString for Set 2015-01-08 11:33:15 -08:00
Armon Dadgar 47f02f80bc CHANGELOG updates 2015-01-07 13:57:03 -08:00
Armon Dadgar b69239e7f8 command/meta: Adding additional nil guards 2015-01-07 13:28:15 -08:00
Armon Dadgar 58a4a0b253 Merge pull request #755 from hashicorp/f-plan-remote-state
command/apply: Handle remote state in a plan file
2015-01-07 13:13:21 -08:00
Armon Dadgar 408ae62306 command/apply: Handle remote state in a plan file 2015-01-07 13:08:32 -08:00
Ryan Uber 87eb457760 Merge pull request #751 from hashicorp/f-consulapi
Switch to github.com/hashicorp/consul/api
2015-01-07 12:50:23 -08:00
Mitchell Hashimoto 3b67537dfa Merge pull request #752 from soblom/aws_instance_docs
Doc fix: Referencing security groups from aws_instance correctly
2015-01-07 07:08:46 -08:00
Sören Blom efca6b0e8a only non-default VPC security groups are referenced by ID. 2015-01-07 12:52:20 +01:00
Ryan Uber 94c3acbca6 Switch to github.com/hashicorp/consul/api 2015-01-06 17:11:29 -08:00
Mitchell Hashimoto 2203ef82a4 up version for development 2015-01-06 16:32:47 -08:00
Mitchell Hashimoto 4e11ed4327 v0.3.6 2015-01-06 15:56:14 -08:00
Mitchell Hashimoto 14bba88514 update CHANGELOG 2015-01-06 15:39:18 -08:00
Mitchell Hashimoto cc0ee4a6bb Merge pull request #731 from atlassian/tags
providers/aws: make tags not computed
2015-01-06 15:38:35 -08:00
Mitchell Hashimoto 4bbf6abb53 Update CHANGELOG 2015-01-06 14:24:22 -08:00
Armon Dadgar eef75a7a2a Merge pull request #695 from moredip/aws_key_pair-resource
add aws_key_pair resource
2015-01-06 10:46:58 -08:00
Armon Dadgar 0ffc11c885 Merge pull request #704 from yahyapo/master
[AWS] Adding default network ACL ID and default security group ID to VPC reference attributes
2015-01-06 10:29:16 -08:00
Pete Hodgson 55347c0e59 Add docs for key_pair AWS resource 2015-01-05 21:45:05 -08:00
Pete Hodgson ce4f4574fb Fix sidebar highlighting bug for aws_network_acl 2015-01-05 21:45:04 -08:00
Armon Dadgar 69ca9efeea Merge pull request #700 from Banno/fix-interpolated-func-with-colon
Adding colon to interpolated regex so they can be used in concats
2015-01-05 11:42:46 -08:00
Armon Dadgar 11dc775c25 Merge pull request #701 from ceh/issue-687
builtin/providers/aws: acceptance tests for assigning private IPs on AWS instance
2015-01-05 11:41:15 -08:00
Armon Dadgar 34d5464c63 Merge pull request #725 from jgoldschrafe/feature-google-compute-service-accounts
Support service accounts on GCE instances
2015-01-05 11:30:38 -08:00
Armon Dadgar 150da4720f Merge pull request #724 from frodenas/google_ubuntu_images
provider/google: Add Ubuntu images
2015-01-05 11:27:07 -08:00
Sander van Harmelen 54ab857a54 Merge pull request #728 from atlassian/route_diff_fix
Route diff fix
2015-01-05 10:43:02 +01:00
Sander van Harmelen 7106917e98 Merge pull request #726 from atlassian/vgw_routes
Vgw routes
2015-01-05 10:39:42 +01:00
Sander van Harmelen d748cfe6f0 Merge pull request #693 from ceh/yavf
builtin/providers/aws: remove unreachable code and skip unnecessary remote call
2015-01-05 10:25:38 +01:00
Sander van Harmelen 9d520c5244 Merge pull request #733 from kvz/patch-1
Fix typo: expacts -> expects
2015-01-05 10:16:23 +01:00
Emil Hessman c738bf0477 builtin/providers/aws: remove unreachable code and skip unnecessary remote call
When DeleteInternetGateway is successful it returns a nil error value.
However, for a nil error value, the RetryFunc returns an error yielding a
unnecessary second call to DeleteInternetGateway in the retry logic.

The logic works because DeleteInternetGateway eventually returns an ec2.Error
with error code InvalidInternetGatewayID.NotFound since the internet gateway
has been deleted in the previous call. The return value of nil breaks the
retry logic and the deletion is deemed successful.

Fix the unnecessary second call to DeleteInternetGateway by short circuiting
with a nil error value when deletion of the internet gateway is successful on
the first try.

Add an acceptance test for internet gateway deletion and remove unreachable
code while here.
2015-01-03 21:56:44 +01:00