Commit Graph

2130 Commits

Author SHA1 Message Date
Clint
b779144a1e Merge pull request #2924 from calvinfo/f-aws-dynamo-arn
provider/aws: Add arn attribute for DynamoDB tables
2015-08-05 14:42:20 -05:00
Clint Shryock
bfaea76b86 more tightly scope s3 bucket object error 2015-08-05 14:27:34 -05:00
Clint Shryock
285b4061db Merge remote-tracking branch 'upstream/master' into f-aws-s3-object-pr-2079
* upstream/master:
  Update CHANGELOG.md
  Update CHANGELOG.md
  provider/aws: allow external ENI attachments
  Update AWS provider documentation
  docs/aws: Fix example of aws_iam_role_policy
  provider/aws: S3 bucket test that should fail
  provider/aws: Return if Bucket not found
  Update CHANGELOG.md
  Update CHANGELOG.md
  helper/schema: record schema version when destroy fails
  settings file is not required
  provider/azure: Allow settings_file to accept XML string
  add note to aws_iam_policy_attachment explaining its use/limitations
  docs: clarify template_file path information
  google: Sort resources by alphabet in docs
  Support go get in go 1.5
  Update CHANGELOG.md
  aws_network_interface attachment block is not required
  provider/aws: Fix issue in Security Group Rules where the Security Group is not found
2015-08-05 13:45:06 -05:00
Clint
941ce5560a Merge pull request #2925 from hashicorp/b-aws-s3-return-on-err
provider/aws: Return if Bucket not found
2015-08-05 13:31:21 -05:00
Paul Hinze
3de3002b49 provider/aws: allow external ENI attachments
If Terraform creates an ENI and it's attached out of band, Terraform
should not attempt to remove the attachment on subsequent runs.

fixes #2436
fixes #2881
2015-08-05 11:07:07 -05:00
Clint Shryock
83827a5cb7 provider/aws: S3 bucket test that should fail 2015-08-03 16:30:54 -05:00
Clint Shryock
c10c47623e provider/aws: Return if Bucket not found 2015-08-03 16:17:01 -05:00
Calvin French-Owen
cb2d90a7d9 provider/aws: Add arn attribute for DynamoDB tables
This commit exports the `arn` as well as the `id`, since IAM
roles require the full resource name rather than just the table
name. I'd even be in favor or having `arn` as the `id` since the
<region, tablename> pair is the uniqueness constraint, but this
will keep backwards compatibility:

http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_CreateTable.html
2015-08-03 14:10:18 -07:00
Clint
27b1aa6637 Merge pull request #2922 from hashicorp/azure-settings-file
provider/azure: Allow settings_file to accept XML string
2015-08-03 16:05:00 -05:00
Clint Shryock
a7543de393 settings file is not required 2015-08-03 15:34:34 -05:00
Clint Shryock
2a5c18d88b provider/azure: Allow settings_file to accept XML string 2015-08-03 15:31:25 -05:00
Clint Shryock
44f470514c provider/aws: Add S3 Bucket Object (supercedes #2079) 2015-07-30 15:17:37 -05:00
Clint Shryock
5c6083e1c4 Merge branch 'master' into f-aws-s3-object-pr-2079
* master: (720 commits)
  Update CHANGELOG.md
  Update CHANGELOG.md
  dynamodb-local Update AWS config https://github.com/hashicorp/terraform/pull/2825#issuecomment-126353610
  Make target_pools optional
  Update CHANGELOG.md
  code formatting
  Update CHANGELOG.md
  providers/google: Fix reading account_file path
  providers/google: Fix error appending
  providers/google: Return if we could parse JSON
  providers/google: Change account_file to JSON
  providers/google: Default account_file* to empty
  providers/google: Add account_file/account_file_contents ConflictsWith
  providers/google: Document account_file_contents
  providers/google: Use account_file_contents if provided
  providers/google: Add account_file_contents to provider
  Update CHANGELOG.md
  Update CHANGELOG.md
  dynamodb-local Use ` instead of : to refer region to keep the consistency with the provider docs
  dynamodb-local Update aws provider docs to include the `dynamodb_endpoint` argument
  ...
2015-07-30 14:30:35 -05:00
Clint Shryock
f4fb053982 provider/aws: Fix issue in Security Group Rules where the Security Group is not found 2015-07-30 14:10:19 -05:00
Dave Cunningham
6e7c6122e9 Merge pull request #2894 from sparkprime/optional_target_pool
Make target_pools optional
2015-07-30 13:52:44 -04:00
Pablo Cantero
5930f22974 dynamodb-local Update AWS config
https://github.com/hashicorp/terraform/pull/2825#issuecomment-126353610

Tks @catsby
2015-07-30 12:21:03 -03:00
Pablo Cantero
28bef7c0c7 Merge branch 'master' into dynamodb-local 2015-07-30 12:16:07 -03:00
Dave Cunningham
65ba4c1b06 Make target_pools optional 2015-07-30 10:46:16 -04:00
Clint
26b416335f Merge pull request #2861 from hashicorp/b-azure-instance-error
provider/azure: Provide a simpler error when using a Platform Image without a Storage Service
2015-07-30 09:28:33 -05:00
Clint Shryock
488587467c code formatting 2015-07-30 09:27:13 -05:00
Justin Campbell
7884456c4b providers/google: Fix reading account_file path 2015-07-29 15:59:33 -04:00
Justin Campbell
4764a556c0 providers/google: Fix error appending 2015-07-29 15:59:33 -04:00
Clint Shryock
8faa111156 providers/google: Return if we could parse JSON 2015-07-29 15:59:32 -04:00
Justin Campbell
773852e2d5 providers/google: Change account_file to JSON
If JSON fails to parse, treat it as a file path
2015-07-29 15:59:32 -04:00
Justin Campbell
2a04708d66 providers/google: Default account_file* to empty
Prevents prompting for input
2015-07-29 15:59:32 -04:00
Justin Campbell
a7ca7e0b36 providers/google: Add account_file/account_file_contents ConflictsWith 2015-07-29 15:59:32 -04:00
Justin Campbell
4ce776d252 providers/google: Use account_file_contents if provided 2015-07-29 15:59:32 -04:00
Justin Campbell
a8d0a70c03 providers/google: Add account_file_contents to provider 2015-07-29 15:59:32 -04:00
Clint
1043fb7c88 Merge pull request #2842 from hashicorp/aws-elasticache-debug
provider/aws: Fix issue with checking for ElastiCache cluster status
2015-07-29 11:42:12 -05:00
Pablo Cantero
75492513ec dynamodb-local Use ` instead of : to refer region to keep the consistency with the
provider docs
2015-07-29 13:36:02 -03:00
Clint Shryock
d3b93d54fb use d.Id() 2015-07-29 11:13:19 -05:00
Clint Shryock
0aafacf3c3 Merge branch 'master' into aws-elasticache-debug
* master: (33 commits)
  Update CHANGELOG.md
  Update CHANGELOG.md
  scripts: change website_push to push from HEAD
  update analytics
  provider/aws: Update source to comply with upstream breaking change
  Update CHANGELOG.
  provider/aws: Fix issue with IAM Server Certificates and Chains
  Increase timeout, IGM delete can be slow
  Make failure of "basic" test not interfere with success of "update" test
  Update CHANGELOG.md
  Use new autoscaler / instance group manager APIs.
  Compute private ip addresses of ENIs if they are not specified
  Update CHANGELOG.md
  Update CHANGELOG.md
  provider/aws: Error when unable to find a Root Block Device name
  Update CHANGELOG.md
  aws_db_instance: Add mixed-case engine test to ensure StateFunc works.
  aws_db_instance: Only write lowercase engines to the state file.
  Update CHANGELOG.md
  Split AWS provider topics by service.
  ...
2015-07-29 11:07:01 -05:00
Clint
3b8df13142 Merge pull request #2816 from TimeIncOSS/f-aws-elb-name-test
provider/aws: Add acceptance test for ELB w/out name
2015-07-29 10:50:49 -05:00
Clint
6339e18f14 Merge pull request #2871 from hashicorp/b-aws-server-sert-fixes
provider/aws: Fix issue with IAM Server Certificates and Chains
2015-07-29 09:37:51 -05:00
Paul Hinze
efaf63969c Merge pull request #2777 from dwradcliffe/dnsimple_force_new
provider/dnsimple: domain and type should force new records
2015-07-29 09:34:24 -05:00
Clint
7de7a406f3 Merge pull request #2874 from hashicorp/b-aws-upstream-fixes
provider/aws: Update source to comply with upstream breaking change
2015-07-28 15:59:16 -05:00
Clint Shryock
579ccbefea provider/aws: Update source to comply with upstream breaking change 2015-07-28 15:29:46 -05:00
Dave Cunningham
4fa68716c2 Merge pull request #2868 from sparkprime/gce_autoscaling
Gce autoscaling
2015-07-28 15:59:29 -04:00
Clint Shryock
8527174c6e provider/aws: Fix issue with IAM Server Certificates and Chains 2015-07-28 14:02:26 -05:00
Dave Cunningham
e8e5495483 Increase timeout, IGM delete can be slow 2015-07-28 14:09:43 -04:00
Dave Cunningham
24167b1085 Make failure of "basic" test not interfere with success of "update" test 2015-07-28 14:09:29 -04:00
Dave Cunningham
5544dac7c6 Merge branch 'master' into gce_autoscaling 2015-07-27 20:48:39 -04:00
Dave Cunningham
1ec247ef37 Use new autoscaler / instance group manager APIs. 2015-07-27 20:47:10 -04:00
Jesse Szwedko
affa09efdd Compute private ip addresses of ENIs if they are not specified
As AWS will assign the ENI an address
2015-07-27 23:24:49 +00:00
Clint
8a4fbbf64c Merge pull request #2745 from ctiwald/ct/lowercase-engine
aws_db_instance: Downcase "engine" for RDS
2015-07-27 14:27:32 -05:00
Clint Shryock
99f9b93b57 provider/aws: Error when unable to find a Root Block Device name
Fixes #2633
2015-07-27 10:59:37 -05:00
Clint Shryock
493b31d122 provider/azure: Trap a specific Platform Image error in a new PlatformStorageError 2015-07-27 10:23:42 -05:00
Christopher Tiwald
4f085ba550 aws_db_instance: Add mixed-case engine test to ensure StateFunc works. 2015-07-24 16:32:21 -04:00
Christopher Tiwald
dfe0efaf17 aws_db_instance: Only write lowercase engines to the state file.
Amazon accepts mixed-case engines, but only returns lowercase. Without
the proper StateFunc, every apply of a mixed-case engine will result in
a new db instance. Standardize on lowercase.
2015-07-24 16:32:21 -04:00
Clint
b75b40553d Merge pull request #2806 from hashicorp/b-aws-lc-cleanup
provider/aws: Clean up externally removed Launch Configurations
2015-07-24 12:00:49 -05:00