Commit Graph

9127 Commits

Author SHA1 Message Date
Philip Witty 5e18031367 Update AWS KMS with respect to key deletion features 2016-03-08 09:30:47 +00:00
Philip Witty 6648df7acc Added AWS KMS key & alias support 2016-03-08 09:30:47 +00:00
Paul Hinze ec5643f031 Merge pull request #5482 from randomeizer/patch-1
Added a cast to "(*schema.Provider)"
2016-03-07 16:29:57 -06:00
Clint bcf1bca564 Update CHANGELOG.md 2016-03-07 15:48:21 -06:00
Paul Hinze 5d2f3a4ce9 Update CHANGELOG.md 2016-03-07 15:28:57 -06:00
Paul Hinze d8a072cfa2 Merge pull request #5460 from hashicorp/phinze/resource-retry-retval
helper/resource: restore retval of resource.Retry on timeout
2016-03-07 15:27:36 -06:00
clint shryock d3dff2aa79 correct beanstalk godeps 2016-03-07 15:13:12 -06:00
clint shryock f0d3176999 provider/aws: Add Elastic Beanstalk Application, Configuration Template, and Environment
This adds support for Elastic Beanstalk Applications, Configuration Templates,
and Environments.

This is a combined work of @catsby, @dharrisio, @Bowbaq, and @jen20
2016-03-07 14:43:23 -06:00
Paul Stack 2458bfe563 Merge pull request #5493 from mmell/patch-1
insert missing word
2016-03-07 21:02:44 +01:00
Michael Mell 525fddff61 insert missing word 2016-03-07 11:18:49 -08:00
Paul Stack 642cf387a3 Update CHANGELOG.md 2016-03-07 18:55:12 +01:00
Paul Stack 46e4717428 Merge pull request #5474 from kjmkznr/skip-normalize-empty-policy
provider/aws: Fix error parsing JSON in S3 bucket policy
2016-03-07 18:53:51 +01:00
Paul Stack 122e9ac42a Merge pull request #5476 from nicolai86/feature/docker-tag-handling
provider/docker fix image test assertions
2016-03-07 18:52:03 +01:00
James Nugent bda0c649a5 Merge pull request #5488 from ijin/patch-1
fix indentation in test
2016-03-07 08:11:10 -06:00
Michael H. Oshita 00288c36b9 fix indentation 2016-03-07 22:18:58 +09:00
Radek Simko 53559ac8bf Merge pull request #5485 from dcgoss/patch-1
Added disk_size_gb documentation to resource "google_compute_instance_template"
2016-03-07 06:47:32 +00:00
Derek Goss 91204cf7eb Added disk_size_gb documentation to resource "google_compute_instance_template"
This was missing in the docs yet was implemented in Terraform. See line 81 in https://github.com/hashicorp/terraform/blob/master/builtin/providers/google/resource_compute_instance_template.go
2016-03-06 21:44:55 -05:00
Kazunori Kojima 8d1292d608 Return empty string when input empty S3 bucket policy
Before:

"" -> "Error parsing JSON: unexpected end of JSON input"

After:

"" -> ""
2016-03-07 09:31:33 +09:00
David Peterson 0c152845ca Added a cast to "(*schema.Provider)" in the standard TestProvider function 2016-03-06 19:16:34 -03:00
James Nugent 3eb0a95f53 Merge pull request #5466 from xbs13/patch-2
Fix Atlas tutorial steps for currently released version
2016-03-06 13:11:05 -06:00
Martin Atkins cd38881d6a Merge pull request #5475 from kjmkznr/fix-aws-docs-current
website: Fix missing sidebar_current
2016-03-06 08:24:43 -08:00
Raphael Randschau f7d4aca965 Fix docker test assertions regarding latest tag 2016-03-06 16:45:06 +01:00
Kazunori Kojima fbc94cb330 website: Fix missing sidebar_current 2016-03-06 23:51:25 +09:00
Radek Simko 38078fbfb8 Merge pull request #5470 from TimeIncOSS/f-api-gateway-cleanup
provider/aws: Cleanup nitpicks in new API Gateway resources
2016-03-06 10:34:47 +00:00
Radek Simko 61d0d19ae3 Fix typo (APIGateway -> API Gateway) 2016-03-06 09:29:31 +00:00
Radek Simko c6c2752211 provider/aws: Sort API Gateway resources alphabetically 2016-03-06 09:29:31 +00:00
Radek Simko fa0d6af524 provider/aws: Remove unnecessary GetChange in Delete funcs 2016-03-06 09:29:31 +00:00
Radek Simko b12d906258 aws/docs: Fix wrong field name (parent_resource_id -> parent_id) 2016-03-06 09:29:31 +00:00
Radek Simko a338eae72a provider/aws: Guard APIGateway resource & REST API against deletion 2016-03-06 09:29:30 +00:00
Radek Simko 0c5a0f96c2 vendor: Update github.com/aws/aws-sdk-go/service/apigateway 2016-03-06 09:29:24 +00:00
Radek Simko caaf9baf45 Update CHANGELOG.md 2016-03-06 09:02:02 +00:00
Radek Simko ce5324b341 Merge pull request #4295 from nicolai86/feature/aws-api-gateway
provider/aws: API Gateway resources
2016-03-06 09:00:02 +00:00
Raphael Randschau 6430fca7f6 Add aws_api_gateway_deployment resource 2016-03-05 23:21:58 +01:00
Raphael Randschau 8c59d0861e Add aws_api_gateway_api_key resource 2016-03-05 23:21:54 +01:00
Raphael Randschau b4c99f1009 Add aws_api_gateway_model resource 2016-03-05 23:21:51 +01:00
Raphael Randschau 4da8b3d03a Add aws_api_gateawy_integration_response resource 2016-03-05 23:21:48 +01:00
Raphael Randschau 1593dbe9c8 Add aws_api_gateway_integration resource 2016-03-05 23:21:44 +01:00
Raphael Randschau 91f5206f8d Add aws_api_gateway_method_response resource 2016-03-05 23:21:41 +01:00
Raphael Randschau 032e6081cb Add aws_api_gateway_method resource 2016-03-05 23:21:38 +01:00
Raphael Randschau 7ead800f6a Add aws_api_gateway_resource resource 2016-03-05 23:21:35 +01:00
Raphael Randschau a73721d248 Add aws_api_gateway_rest_api resource 2016-03-05 23:13:38 +01:00
Raphael Randschau fdf0cfa66d Vendor AWS APIGateway API 2016-03-05 23:12:19 +01:00
Paul Stack 304ccdfb8f Update CHANGELOG.md 2016-03-05 19:20:19 +01:00
Paul Stack b66b9c92a2 Merge pull request #5401 from Originate/mb-fix-kinesis-stream-shard-count
provider/aws: Report the correct number of shards for Kinesis streams
2016-03-05 19:19:16 +01:00
Paul Stack eda1230479 Merge pull request #5469 from stack72/b-aws-kinesis-stream-shardcount
provider/aws: Adding a test for AWS Kinesis Stream Shard Count
2016-03-05 19:14:24 +01:00
stack72 d63166c025 provider/aws: Adding a test for AWS Kinesis Stream Shard Count 2016-03-05 18:40:47 +01:00
Paul Stack 75679a1eb2 Merge pull request #5461 from marcosnils/dynamodb_stream_fix
Fix DynamoDB stream attribute scope
2016-03-05 18:39:49 +01:00
Radek Simko d86caf436b Merge pull request #5468 from f440/update-command-example
Bring usage docs up to date
2016-03-05 13:30:03 +00:00
f440 b7008babd7 Bring usage docs up to date 2016-03-05 19:25:16 +09:00
Michael Perez 9c3917f435 Update remote.html.markdown
these changes were added to reflect what was required to run the tutorial on my local machine. Below is my context for the above changes:
```shell
[2016-03-04T18:22:44] micperez in terraform_test  
λ terraform remote config -backend-config="name=puhrez/getting-started"
missing 'access_token' configuration or ATLAS_TOKEN environmental variable

If the error message above mentions requiring or modifying configuration
options, these are set using the `-backend-config` flag. Example:
-backend-config="name=foo" to set the `name` configuration
[2016-03-04T18:23:27] micperez in terraform_test  
λ export ATLAS_TOKEN=<REDACTED>
[2016-03-04T18:24:12] micperez in terraform_test  
λ terraform remote config -backend-config="name=puhrez/getting-started"
Remote state management enabled
Remote state configured and pulled.
[2016-03-04T18:24:16] micperez in terraform_test  
λ terraform push -name="puhrez/getting-started"
An error has occurred while archiving the module for uploading:
error detecting VCS: no VCS found for path: /Users/micperez/code/terraform_test
[2016-03-04T18:24:39] micperez in terraform_test  
λ git init
Initialized empty Git repository in /Users/micperez/code/terraform_test/.git/
[2016-03-04T18:25:09] micperez in terraform_test [git:master]  
λ terraform push -name="puhrez/getting-started"
An error has occurred while archiving the module for uploading:
error getting git commit: exit status 128
stdout: 
stderr: fatal: bad default revision 'HEAD'

[2016-03-04T18:25:12] micperez in terraform_test [git:master]  
λ git status
On branch master

Initial commit

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	.terraform/
	example.tf
	terraform.tfstate.backup

nothing added to commit but untracked files present (use "git add" to track)
[2016-03-04T18:25:17] micperez in terraform_test [git:master]  
λ git add example.tf
[2016-03-04T18:25:24] micperez in terraform_test [git:master]  
λ git commit -m "init commit"
[master (root-commit) 34c4fa5] init commit
 1 file changed, 10 insertions(+)
 create mode 100644 example.tf
[2016-03-04T18:25:32] micperez in terraform_test [git:master]  
λ terraform push -name="puhrez/getting-started"
Uploading Terraform configuration...
Configuration "puhrez/getting-started" uploaded! (v1)
```
2016-03-04 18:42:32 -05:00