Commit Graph

2167 Commits

Author SHA1 Message Date
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
Radek Simko f8fac710ad Randomize name of S3 bucket in acctest 2016-02-17 12:36:19 +00:00
Radek Simko db0d48eb84 Add retry-logic and mutexes to work around inconsistent nature of IAM 2016-02-17 11:38:24 +00:00
Radek Simko 8481625596 Add retry logic to s3_bucket to prevent OperationAborted errors 2016-02-17 11:38:20 +00:00
Paul Stack ec0e445c25 Merge pull request #4973 from paultyng/pt/elasticsearch-tags
AWS - Tag support for Elasticsearch
2016-02-17 10:35:18 +00:00
clint shryock a706b7c8a4 provider/aws: Return an error if no route is found for an AWS Route 2016-02-16 16:08:02 -06:00
Paul Stack 77deff1194 Merge pull request #5135 from TimeIncOSS/f-aws-cloudtrail-tags
provider/aws: Add support for CloudTrail tags
2016-02-16 21:55:45 +00:00
vince rosso 3baabb0186 VPC config support in Lambda functions
fixes #5105
2016-02-16 10:43:51 -08:00
clint shryock 320dc3ddf4 provider/aws: Err on failure to attach elb in OpsWorks layer update 2016-02-16 10:31:30 -06:00
Paulo Schreiner 923f7dca37 Added error checking and removed debug statement 2016-02-16 09:44:15 -06:00
Paulo Schreiner 7293ab99d3 Added option to attach an ELB to Opsworks layer 2016-02-16 09:44:15 -06:00
Radek Simko b7a63c15f9 provider/aws: Add tests for new validators 2016-02-15 17:16:41 +00:00
Radek Simko d2a3799158 provider/aws: Add tests for aws_lambda_permission 2016-02-15 17:16:41 +00:00
Radek Simko 64539d30bc provider/aws: Add aws_lambda_permission 2016-02-15 17:16:41 +00:00
Radek Simko 3f66347025 provider/aws: Add tests for CloudTrail tags 2016-02-15 14:10:36 +00:00
Radek Simko fb0838ce1b provider/aws: Add support for CloudTrail tags 2016-02-15 14:10:19 +00:00
Radek Simko fdd9c3b2b8 Merge pull request #4711 from srikalyan/master
Added support for http/https endpoints that auto confirms SNS topic subscription.
2016-02-14 21:13:22 +00:00
Srikalyan Swayampakula 345dbce77a Made the necessary changes to ensure the variable name represents right value. 2016-02-13 12:15:29 -08:00
Radek Simko 30082a4c85 provider/aws: Add acc tests for CloudWatch Event Target 2016-02-13 13:21:33 +00:00
Radek Simko 61afc6d34d provider/aws: Add CloudWatch Event Target 2016-02-13 13:21:33 +00:00
Radek Simko b5039dd897 provider/aws: Add acc tests for CloudWatch Event Rule 2016-02-13 13:21:33 +00:00
Radek Simko ab89e5e528 provider/aws: Add CloudWatch Event Rule 2016-02-13 13:21:32 +00:00
Chris Marchesi c24fbc3f24 IGW detatch waiter tweak, 30 not found checks w/15 min max 2016-02-12 17:31:49 -08:00
clint shryock e7fa0952de provider/aws: Add some randomization for this IAM test 2016-02-12 14:38:23 -06:00
Srikalyan Swayampakula f21dc995c5 Update code based on the review suggestions.
1. Used resource.Retry instead of custom solution
2. Removed unnecessary variables and added required variable to resource.Retry.
2016-02-12 12:21:52 -08:00
clint shryock 9c3699d905 provider/aws: Add some randomization to this test 2016-02-12 14:17:19 -06:00
clint shryock 2a860ff564 provider/aws: Switch format for error message to utilize Go Stringer 2016-02-12 14:16:20 -06:00
clint shryock a344204cc7 provider/aws: format and randomize RDS Cluster Instance tests 2016-02-12 11:43:07 -06:00
clint shryock a7af4c46b2 rename test 2016-02-12 11:21:03 -06:00
Clint 169b63e401 Merge pull request #5032 from clstokes/f-aws-gateway-tunnel-info
provider/aws: Expose additional VPN Connection attributes.
2016-02-12 10:31:23 -06:00
Hasan Türken 766dac4d79 update documentation 2016-02-12 09:56:48 -06:00
Hasan Türken e41266e971 Move endpoint options into endpoints block 2016-02-12 09:38:21 -06:00
Hasan Türken 231604e8b7 support custom endpoints for AWS EC2 ELB and IAM 2016-02-12 09:35:50 -06:00
Paul Hinze 66ec38b2d9 Merge pull request #5046 from tpounds/use-built-in-schema-string-hash
Use built-in schema.HashString instead of custom hash functions.
2016-02-12 07:58:34 -06:00
clint shryock 8b4a366b43 Merge branch 'pr-4969'
* pr-4969:
  provider/aws: All security group mods on first run when restoring from snapshot
2016-02-11 16:40:29 -06:00
clint shryock 21a59fc708 provider/aws: All security group mods on first run when restoring from snapshot 2016-02-11 16:39:53 -06:00
Paul Stack 06fdadf491 Merge pull request #5099 from tpounds/cleanup-aws-type-conversions
provider/aws: Consolidate duplicate list/set type conversions
2016-02-11 22:29:50 +00:00
Clint 934c31f76b Merge pull request #4969 from Chili-Man/bugfix/aws_provider_rds_security_groups
provider/aws: apply security group changes in EC2 Classic RDS for aws_db_instance
2016-02-11 16:12:12 -06:00
Clint e04450d95f Merge pull request #4958 from hashicorp/b-aws-r53-record-tests
provider/aws: Add a regression test for Route53 records
2016-02-11 13:32:29 -06:00
Trevor Pounds 57a9048510 Consolidate duplicate list/set type conversions. 2016-02-11 00:48:58 -08:00
Trevor Pounds 164596880a Update acceptance test to use t2.micro instances.
The AWS free tier allows up to 750 hours on t2.micro
instance types. It's better to use cheaper instances
in case the resources are not cleaned up if a tests
is canceled or crashes.
2016-02-09 00:24:38 -08:00
Trevor Pounds 5624a33239 Change AWS ELB health_check to list type.
There can only be a single health_check configuration per load balancer
so choosing to use a list over a set is only relevant when comparing
changes during a plan. A list makes it much easier to compare updates
since the index is stable (0 vs. computed hash).
2016-02-08 23:08:35 -08:00
Trevor Pounds 5801b991c9 Cleanup unrelated config to speed up autogenerate name acc test.
Removes overspecified config that is unrelated to testing the auto scaling
group's autogenerated name. The test is only concerned with checking that
the auto scaling group was created successfully with an autogenerated name
matching a specific pattern.
2016-02-08 21:28:35 -08:00