ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,320 Commits 1 Branch 0 Tags 187 MiB
Commit Graph

2209 Commits

Author SHA1 Message Date
Radek Simko 4c1f8db32d aws: kms_key - Change field name (deletion_window -> deletion_window_in_days) 2016-03-08 09:30:47 +00:00
Radek Simko fccffbcbb1 aws: kms_alias - Remove unnecessary default ForceNew state 2016-03-08 09:30:47 +00:00
Radek Simko 5c9fe668f5 aws: kms resources - Simplify error handling 2016-03-08 09:30:47 +00:00
Radek Simko 2b244e21bc aws: kms validation - Add missing placeholders for Errorf 2016-03-08 09:30:47 +00:00
Radek Simko 5466d69450 aws: kms resources - gofmt all the code 2016-03-08 09:30:47 +00:00
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
Raphael Randschau 2c698d2cb0 Always transform aws_security_group protocol to lower case 
fixes #5489
 2016-03-07 22:40:29 +01: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 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
Michael H. Oshita 00288c36b9 fix indentation 2016-03-07 22:18:58 +09: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
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 a338eae72a provider/aws: Guard APIGateway resource & REST API against deletion 2016-03-06 09:29:30 +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 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
stack72 d63166c025 provider/aws: Adding a test for AWS Kinesis Stream Shard Count 2016-03-05 18:40:47 +01:00
Kraig Amador 74de6531fe Return an error when conflicting etag & kms_key_id parameters are provided and now with ServerSideEncryption we can go back to the higher level PutObject. 2016-03-04 09:22:43 -08:00
Kraig Amador db91aebd8e Added a kms_key_id parameter which will allow you to encrypt objects that are put into a bucket. 2016-03-03 16:20:01 -08:00
Maxime Bury ae8627f92a Report the correct number of shards 2016-03-01 10:46:39 -08:00
Radek Simko dc45f84a8f Allow recovering from failed CW Event Target creation in state 2016-03-01 12:37:36 +00:00
Radek Simko 5a786d52d9 Fix: Do not store ID of CW Event Target if creation fails 2016-03-01 12:35:15 +00:00
stack72 d3697fa50b provider/aws: Combine AWS Metrics Collection resource and AWS 
Autoscaling Group
 2016-02-29 20:58:41 +00:00
stack72 4fc1391303 Scaffold the AWS Autoscaling Group Metrics Collection 2016-02-29 19:24:30 +00:00
stack72 ffbb59a73e provider/aws: Fixes the use of Uppercase chars in ELB Listeners 2016-02-29 18:04:47 +00:00
Paul Stack e6f3fafcd6 Merge pull request #5361 from stack72/b-aws-es-tags 
provider/aws: `aws_elastisearch_domain` tags not being set correctly.
 2016-02-29 17:38:06 +00:00
Maxime Bury 0290884fdc Lambda S3 object version defaults to '$LATEST' if unspecified 2016-02-29 14:31:47 +00:00
stack72 7b61567bf6 provider/aws: `aws_elastisearch_domain` tags not being set correctly. 
The top level object was used not the tags within
 2016-02-28 18:31:58 +00:00
Paul Stack a372800cd0 Merge pull request #5318 from stack72/f-aws-route53zone-updateComment 
provider/aws: Add ability to update r53 zone comment
 2016-02-26 19:43:13 +00:00
James Nugent f249a432fc Merge pull request #5329 from hashicorp/b-5310 
provider/aws: Fix crash creating rules in aws SGs
 2016-02-26 14:42:01 -05:00
Radek Simko 5b4fccaa73 provider/aws: Add acceptance test for IAM Account Password Policy 2016-02-26 13:29:34 +00:00
stack72 d750d4d1cc provider/aws: Add ability to update r53 zone comment 2016-02-26 13:26:25 +00:00
Radek Simko f7f3d95a9b provider/aws: Add support for AWS Account Password Policy 2016-02-26 11:04:25 +00:00
James Nugent 5b548e938c Merge pull request #5327 from Originate/s3-website-routing-rules 
Added routing rules to s3 buckets
 2016-02-25 14:43:55 -05:00
James Nugent 3adae0216c provider/aws: Fix crash creating rules in aws SGs 
This commit uses Group Name in preference to Group ID where appropriate
in the aws_security_group_rule resource. This fixes the crash reported
in #5310.

Fixes #5310.
 2016-02-25 13:50:24 -05:00
Drew Minnear ef50479e8a added routing rules to s3 buckets 2016-02-25 10:19:23 -08:00
Radek Simko 4b8726dc2b Merge pull request #5305 from TimeIncOSS/f-s3-obj-update-and-versioning 
provider/aws: Enable updates & versioning for s3_bucket_object
 2016-02-25 12:19:34 +00:00
Radek Simko 44246ca126 provider/aws: Add tests for s3_bucket_object w/ versioning enabled 2016-02-25 12:04:18 +00:00
Radek Simko ef85147559 provider/aws: Add tests for s3_bucket_object updates 2016-02-25 12:04:18 +00:00
Radek Simko 9377b301ca provider/aws: Cleanup s3_bucket_object acceptance tests 
- the goal was to allow running tests in parallel and to get rid of global variables in the aws package
 2016-02-25 12:04:18 +00:00
Radek Simko 24ac996963 provider/aws: Add support for versioned objects 2016-02-25 12:04:18 +00:00
Radek Simko 2f8b9edaf8 provider/aws: Add support for s3_bucket_object updates 2016-02-25 12:04:16 +00:00
James Nugent 74e5711f08 Merge pull request #5182 from Originate/mb-fix-lambda-vpc-implementation 
provider/aws: Fixes terraform crash when lambda VpcId is nil
 2016-02-24 17:52:38 -05:00
Paul Hinze 893bfb3ff4 provider/aws: Fix int overflow on 386 builds 
386 architecture builds were failing with:

```
builtin/providers/aws/resource_aws_sns_topic_subscription.go:216: constant 60000000000 overflows int
```
 2016-02-24 13:55:01 -06:00
Paul Hinze cb8f0f04b5 fix go vet warnings 
```
go tool vet -all .
builtin/providers/aws/resource_aws_elasticache_security_group.go:130: arg apierr.Code in printf call is a function value, not a function call
builtin/providers/aws/resource_aws_elasticache_subnet_group.go:155: arg apierr.Code in printf call is a function value, not a function call
```
 2016-02-24 09:48:32 -06:00
Radek Simko ebf2fd54e5 provider/aws: Clean up whitespaces 2016-02-24 14:58:17 +00:00
Radek Simko 70f045e46e provider/aws: Breaking change - Trim off quotes for aws_s3_bucket_object.etag 2016-02-24 14:58:17 +00:00
Maxime Bury f92b2b7c58 Also ignore empty VPC config after all 2016-02-23 12:56:46 -08:00
Paul Stack e454b21100 Merge pull request #5271 from stack72/f-aws-dynamodb-stream-arn 
provider/aws: Enable DynamoDB Table to output `stream_arm` when streams are enabled
 2016-02-23 17:27:22 +00:00
Paul Stack 039065f63a Merge pull request #5223 from stack72/f-aws-kinesis-retention-period 
provider/aws: Implement RetentionPeriod Changes for Kinesis Stream
 2016-02-23 17:26:12 +00:00
stack72 8d6cfe8e89 Implement RetentionPeriod Changes for AWS Kinesis Stream 2016-02-23 17:15:33 +00:00
stack72 0ce4aed52a provider/aws: Enable DynamoDB Table to output `stream_arm` when streams 
are enabled
 2016-02-23 15:40:41 +00:00
Paul Hinze b5e6a4fac7 Merge pull request #5101 from tpounds/fix-read-aws-asg-termination-policies 
provider/aws: Fix reading auto scaling group termination policies
 2016-02-23 08:03:18 -06:00
Trevor Pounds 066a60debe Add termination policies acceptance test. 2016-02-22 17:05:10 -08:00
Trevor Pounds b39cc55f37 Cleanup termination policy update logic. 2016-02-22 17:05:09 -08:00
Trevor Pounds 44b00782c3 Fix termination policies read logic. 2016-02-22 17:05:09 -08:00
Paul Hinze ce948c0dea Merge pull request #5120 from paybyphone/paybyphone_igw_destroyfix 
IGW detatch waiter tweak, 30 not found checks w/15 min max
 2016-02-22 18:17:12 -06:00
Paul Hinze 9c0e52bc4b Merge pull request #5100 from hashicorp/b-aws-sg-drift-updates 
provider/aws: Security Group drift updates
 2016-02-22 18:10:49 -06:00
Paul Stack 57f58dec98 Merge pull request #5262 from stack72/b-aws-redshift-cluster-public 
provider/aws: `aws_redshift_cluster` publicly_accessible now defaults true
 2016-02-22 23:19:30 +00:00
stack72 e822d46843 provider/aws: `aws_redshift_cluster` publicly_accessible now defaults to 
true
 2016-02-22 23:11:55 +00:00
Paul Hinze 5528abb51e Merge pull request #5255 from hashicorp/phinze/improve-vpc-cidr-errmsg 
provider/aws: improve vpc cidr_block err message
 2016-02-22 16:54:47 -06:00
Paul Hinze ce74e3d8f0 provider/aws: improve vpc cidr_block err message 
Pull CIDR block validation into a shared func ready to be used elsewhere

Example of new err message:

```
Errors:

  * aws_vpc.foo: "cidr_block" must contain a valid network CIDR,
    expected "10.0.0.0/16", got "10.0.1.0/16"
```
 2016-02-22 16:44:33 -06:00
Paul Stack d5fb018250 Merge pull request #4945 from stack72/aws-rds-enhanced-monitoring 
provider/aws: Enabled Enhanced Monitoring for RDS
 2016-02-22 22:02:09 +00:00
James Nugent a285ae1e2c Fix format string making vet fail 2016-02-22 13:34:15 -05:00
James Nugent 16b18df1fd Merge pull request #5238 from stack72/f-aws-redshift-calculate-cluster 
provider/aws: Change Redshift Cluster cluster_type to be computed
 2016-02-22 13:18:09 -05:00
Paul Stack 30dcc45635 Merge pull request #5178 from hashicorp/f-aws-iam-server-updates 
provider/aws: Update IAM Server Cert
 2016-02-22 18:07:22 +00:00
Paul Stack c4dd1a9a64 Merge pull request #5197 from hashicorp/f-aws-db-snapshot-copy 
provider/aws: Fix copy_tags_to_snapshot for DB Instance
 2016-02-22 18:05:41 +00:00
Paul Stack 0214319333 Merge pull request #4882 from stack72/f-aws-asg-getAutoscaleGroup 
provider/aws: Autoscaling Group Code Refactor
 2016-02-22 09:58:53 +00:00
Paul Stack 1e7f10d3a3 Merge pull request #5066 from tpounds/fix-aws-elb-health-check-type 
provider/aws: Change ELB health_check to list type
 2016-02-21 22:38:10 +00:00
stack72 628fb1a37c provider/aws: Add test to ECS Service to make sure deployment values are 
set
 2016-02-21 22:33:48 +00:00
stack72 5f7060e9f5 Merge branch 'ecs_service_deployment_cfg' of https://github.com/joshgarnett/terraform into joshgarnett-ecs_service_deployment_cfg 2016-02-21 22:09:20 +00:00
stack72 e6e18a4a9e provider/aws: Change Redshift Cluster cluster_type to be computed 
It will be based off the number of nodes. Can only be multi-node (>1
node) or single-node (nodes=1)
 2016-02-21 19:42:02 +00:00
innossh 564dd360a2 provider/aws: Support additional changes to security groups of instance without forcing new 2016-02-21 14:24:33 +09:00
James Nugent c91b648c15 core: Test fix for mismatched diffs from GH-4965 
This test presents itself in an awkward manner as part of the AWS test
suite rather than the core test suite - this is because you cannot use
real providers in context tests because of circular references, and
simplistic test providers in that package do not demonstrate the issue.
In the interests of getting this fix in quickly and still having
regression coverage for it, it was agreed to include the change here
instead.

Running the test TestAccAWSVPC_coreMismatchedDiffs without the changes
in d95ab75 applied leads to the following output:

```
$ make testacc TEST=./builtin/providers/aws TESTARGS="-run TestAccAWSVPC_coreMismatchedDiffs"
==> Checking that code complies with gofmt requirements...
/Users/James/Code/go/bin/stringer
GO15VENDOREXPERIMENT=1 go generate $(GO15VENDOREXPERIMENT=1 go list ./... | grep -v /vendor/)
TF_ACC=1 GO15VENDOREXPERIMENT=1 go test ./builtin/providers/aws -v -run TestAccAWSVPC_coreMismatchedDiffs -timeout 120m
=== RUN   TestAccAWSVPC_coreMismatchedDiffs
--- FAIL: TestAccAWSVPC_coreMismatchedDiffs (2.26s)
	testing.go:148: Step 0 error: Error applying: 1 error(s) occurred:

		* aws_vpc.test: diffs didn't match during apply. This is a bug with Terraform and should be reported.
FAIL
exit status 1
FAIL	github.com/hashicorp/terraform/builtin/providers/aws	2.281s
make: *** [testacc] Error 1
```

Applying the changes in d95ab75 (pull request GH-4965) yields the
following result when running the test:

```
$ make testacc TEST=./builtin/providers/aws TESTARGS="-run TestAccAWSVPC_coreMismatchedDiffs"
==> Checking that code complies with gofmt requirements...
/Users/James/Code/go/bin/stringer
GO15VENDOREXPERIMENT=1 go generate $(GO15VENDOREXPERIMENT=1 go list ./... | grep -v /vendor/)
TF_ACC=1 GO15VENDOREXPERIMENT=1 go test ./builtin/providers/aws -v -run TestAccAWSVPC_coreMismatchedDiffs -timeout 120m
=== RUN   TestAccAWSVPC_coreMismatchedDiffs
--- PASS: TestAccAWSVPC_coreMismatchedDiffs (15.17s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	15.183s
```

The test has a rather misleading name ("AWS") such that it is actually run as
part of the nightly acceptance testing. The VPC resource is quick and free to
create, hence the selection.
 2016-02-19 21:24:49 -05:00
clint shryock 280054a387 provider/aws: Security Rules drift and sorting changes 
This commit adds failing tests to demonstrate the problem presented with AWS
aggregating the security group rules
 2016-02-19 16:51:08 -06:00
Joshua Garnett 12958fb5e7 Added support for the deployment configuration settings to the ecs service resource. 2016-02-19 15:32:39 -05:00
Maxime Bury 288ba868e4 Harden things around VPC config 2016-02-18 13:45:32 -08:00
clint shryock ca29437581 provider/aws: Fix copy_tags_to_snapshot for DB Instance 2016-02-18 11:33:21 -06:00
Maxime Bury f0f3c430a8 Generalize fix to ignore empty VPC config 2016-02-17 21:45:13 -05:00
Maxime Bury eb2aaef016 VpcId can be nil in the wild 2016-02-17 20:06:18 -05:00
clint shryock fce562ba0b update name length 2016-02-17 17:03:31 -06:00
clint shryock c8178ad31c provider/aws: Update IAM Server Cert to allow name_prefix, auto generated namesprovider/aws: Update IAM Server Cert to allow name_prefix, auto generated namesdiff 2016-02-17 16:34:02 -06:00
James Nugent f7504f7f9f Merge branch 'master' of https://github.com/vincer/terraform into vincer-master 2016-02-17 13:16:16 -08:00
James Nugent bc6107508d Fix additional vet warnings 2016-02-17 11:59:50 -08:00
Trevor Pounds e130b2c2dc Fix `go vet` printf verb warnings. 
e.g. arg trail.LogFileValidationEnabled for printf verb %t of wrong type: *bool
 2016-02-17 11:59:50 -08:00
Clint 37a708a2f0 Merge pull request #5155 from hashicorp/b-aws-route-error 
provider/aws: Return an error if no route is found for an AWS Route
 2016-02-17 10:02:48 -06:00
Clint 52e0cd82bd Merge pull request #5116 from hashicorp/b-aws-acc-tests 
provider/aws: Update some tests to introduce more randomization
 2016-02-17 10:02:20 -06:00
Radek Simko 35345c92af fix: Return non-aws errors if bucket creation fails 2016-02-17 13:49:41 +00:00
Paul Stack cd28433c2a Merge pull request #4826 from TimeIncOSS/f-aws-lambda-permission 
[WIP] provider/aws: Add aws_lambda_permission
 2016-02-17 13:31:29 +00:00