Commit Graph

1404 Commits

Author SHA1 Message Date
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
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
Clint Shryock 30572212f2 Merge branch 'master' into pr-2779
* master: (86 commits)
  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
  use d.Id()
  Update CHANGELOG.md
  Update CHANGELOG.md
  scripts: change website_push to push from HEAD
  update analytics
  core: fix crash on provider warning
  provider/aws: Update source to comply with upstream breaking change
  Update CHANGELOG.
  provider/aws: Fix issue with IAM Server Certificates and Chains
  ...
2015-07-29 15:54:56 -05: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
Clint Shryock 579ccbefea provider/aws: Update source to comply with upstream breaking change 2015-07-28 15:29:46 -05:00
Clint Shryock 8527174c6e provider/aws: Fix issue with IAM Server Certificates and Chains 2015-07-28 14:02:26 -05: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
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
Clint Shryock 8ac28c12f3 provider/aws: Fix issue with checking for ElastiCache cluster status 2015-07-24 11:43:28 -05:00
Jesse Szwedko 5554942721 This adds the source_dest_check attribute to the aws_network_interface resource
Defaults to true to be consistent with AWS
2015-07-23 06:16:51 +00:00
Pablo Cantero 35201e730e dynamodb-local Add `dynamodb_endpoint` allowing to change the DynamoDB Endpoint for
example to connect to dynamodb-local
2015-07-22 18:57:29 -03:00
John Engelman cbe9be4571 Add website_domain for S3 buckets. 2015-07-22 10:38:28 -05:00
Radek Simko 57dfaa4922 provider/aws: Add acceptance test for ELB w/out name 2015-07-22 14:33:57 +02:00
Clint f979fd7dee Merge pull request #2571 from TimeIncOSS/f-aws-autogenerated-elb-name
provider/aws: Allow ELB name to be generated
2015-07-21 15:52:36 -05:00
Clint Shryock b720387449 provider/aws: Clean up externally removed Launch Configurations
Handle Launch Configurations that are not found more gracefully, but tolerating
an additional API error indicating the LC no longer exists.
2015-07-21 11:13:41 -05:00
Clint 4532f3ddcc Merge pull request #2805 from rnaveiras/spot-instance-typo
Amend AWS spot instace state name cancelled
2015-07-21 10:43:31 -05:00
Clint f3149e9ea5 Merge pull request #2804 from hashicorp/testacc-convergence
provider/aws: Converge on TestAccAWS for acceptance tests names
2015-07-21 10:34:00 -05:00
Raúl Naveiras 87239dcec8 Amend AWS spot instace state name cancelled 2015-07-21 17:26:00 +02:00
Clint 81957f7453 Merge pull request #2794 from hashicorp/b-aws-instance-monitoring
provider/aws: Fix issue with toggling monitoring in AWS Instances
2015-07-21 10:22:37 -05:00
Clint Shryock 3688d4ba00 provider/aws: Converge on TestAccAWS for acceptance tests names
An attempt to converge the tests into a standard naming scheme

- TestAccAWS for aws tests
- a `_basic` test for each suite, save a few that are quick (Network ACLs, for
  example)
2015-07-21 09:42:02 -05:00
Radek Simko 4797a82e1a aws: Simplify ValidateCredentials func 2015-07-21 15:57:59 +02:00
Clint 70cf3a7ace Merge pull request #2730 from hashicorp/f-aws-fail-nicer
provider/aws: Check credentials before attempting to do anything
2015-07-21 08:34:55 -05:00
Clint 60305cb879 Merge pull request #2728 from hashicorp/b-aws-db-param-bug
provider/aws: Fix issue with detecting differences in DB Parameters
2015-07-20 12:38:17 -05:00
Clint Shryock db5d0301d8 provider/aws: Fix issue with toggling monitoring in AWS Instances 2015-07-20 12:32:58 -05:00
Marc Tamsky 521451db4d provider/aws/aws_instance: add new argument `instance_initiated_shutdown_behavior`,
accepts string values of 'stop' or 'terminate'.

Signed-off-by: Marc Tamsky <tamsky@users.noreply.github.com>
2015-07-18 09:45:34 -07:00
Clint Shryock 1091884735 provider/aws: Fix issue with Launch Configurations and enable_monitoring
Can now set this value to false. Fixes #2734
2015-07-15 10:42:39 -05:00
Clint abe62e635a Merge pull request #2724 from hashicorp/f-aws-asg-updates
provider/aws: Improved Auto Scaling Groups updates
2015-07-15 08:42:54 -05:00
Clint Shryock 975e1a6c2c provider/aws: Check credentials before attempting to do anything 2015-07-14 16:39:50 -05:00
Clint Shryock 7756bf3aef provider/aws: Fix issue with detecting differences in DB Parameters
Fixes #2718
2015-07-14 14:47:18 -05:00
Radek Simko 4d1d4ea0df provider/aws: Add acceptance tests for aws_vpc_endpoint 2015-07-14 18:48:41 +01:00
Garrett Johnson f9e825efca provider/aws: Add new resource - aws_vpc_endpoint 2015-07-14 18:48:41 +01:00
Clint Shryock 04a5890853 minor fix to the test 2015-07-14 10:39:31 -05:00
Clint Shryock ed98e02e4a provider/aws: Improved Auto Scaling Groups updates
- availability zones are optional if you specify a VPC Zone Identifier (subnet)
- availability zones can be updated in place
2015-07-14 10:19:10 -05:00
Radek Simko c4a2df9e93 aws: Improve formatting of debug logs 2015-07-12 15:36:47 +01:00
Radek Simko 9882cc59d8 aws: Add regression test for renaming ecs_cluster 2015-07-12 14:37:39 +01:00
Radek Simko 21e4b5e3cf aws: Use ClientToken when creating ecs_service 2015-07-12 14:37:39 +01:00
Radek Simko c72c5cebff aws: Allow migrating (recreating) ecs_service to another cluster 2015-07-12 14:37:39 +01:00
Radek Simko 37d10ebf37 aws: Retry ecs_cluster deletion if instances or services are active 2015-07-12 14:37:30 +01:00
Radek Simko 7c03b0dedc provider/aws: Improve test name (underscores -> undocumentedCharacters)
- ref #2665
2015-07-10 08:13:05 +01:00
Radek Simko 77e563d358 Merge pull request #2665 from bitglue/dots_in_subnetgroup
Allow dots in the name of aws_db_subnet_group
2015-07-10 08:00:31 +01:00
Alex Philipp 3cb2a3b0b8 aws_db_instance: fix missing format arg 2015-07-09 14:28:50 -05:00
Phil Frost fb1226321c Allow dots in the name of aws_db_subnet_group
The RDS API reference doesn't say dots are allowed, but they are. For
the sake of people who have preexisting resources with dots in the
names, we should allow them also. Fixes #2664.
2015-07-09 13:57:12 -04:00
Katelyn Perry 6fbebe3172 provider/aws: bump internet gateway detach timeout 2015-07-09 10:42:16 -05:00
Clint Shryock ef28007988 merge master 2015-07-08 13:05:33 -06:00
Clint d34bd0d227 Merge pull request #2640 from hashicorp/b-aws-spot-instance-fix
provider/aws: Fix issue where spot instance requests would crash
2015-07-08 12:32:13 -06:00
Clint f2ff63d0da Merge pull request #2644 from hashicorp/b-aws-sg-account-update
provider/aws: Fix issue in Classic env with external Security Groups
2015-07-08 12:29:50 -06:00
Clint 82d142cc5f Merge pull request #2634 from hashicorp/f-aws-elasticache-redis-s3-snap
provider/aws: Add support for restoring from Redis backup stored in S3
2015-07-08 11:51:23 -06:00
Clint Shryock cc79e6cb8d provider/aws: Fix issue in Classic env with external Security Groups
Linking a security group from another account requires setting the UserID, which
we were stripping out
2015-07-07 12:06:36 -06:00
Clint Shryock 49a01ee787 provider/aws: Add maintenance window to ElastiCache cluster
Implements #2612
2015-07-07 10:41:46 -06:00
Clint Shryock 2fedaa9a4b provider/aws: Fix issue where spot instance requests would crash
Requests that are pending do not have an InstanceID
2015-07-07 09:48:04 -06:00
Clint Shryock edf8948d52 provider/aws: Add support for restoring from Redis backup stored in S3
Fixes #2377
2015-07-06 16:19:15 -06:00
Radek Simko 0ba041912e Add regression test for db_subnet_group w/ underscores
- ref https://github.com/hashicorp/terraform/issues/2603
2015-07-02 23:58:46 +02:00
Radek Simko 127fa3090f Merge pull request #2604 from CpuID/cpuid_gh2603
Allow underscores in aws_db_subnet_group name
2015-07-02 23:57:49 +02:00
Clint 460d49fd52 Merge pull request #2062 from reverbdotcom/adding-rds-snapshots
Adding rds snapshots
2015-07-02 08:56:51 -05:00
Nathan Sullivan c0b692b360 allow underscores in aws_db_subnet_group name, docs don't claim they are
allowed but they are.
2015-07-02 14:45:25 +10:00
Radek Simko 1e8fb65925 provider/aws: Add regression test for ELB name validation
- prevent #2580 from hapenning again
2015-07-01 07:29:56 +01:00
Panagiotis Moustafellos 0cbb815d28 providers/aws: aws_elb: Allow alnum plus hyphen in name attribute 2015-07-01 09:16:32 +03:00
Adam Enger ca8736d29f Merge branch 'master' of github.com:reverbdotcom/terraform into adding-rds-snapshots
* 'master' of github.com:reverbdotcom/terraform: (524 commits)
  docs: tweaks to RELEASING
  Minor change to docs
  Update CHANGELOG.md
  Update DynamoDB example docs to remove non-key attributes; update test to remove non-key attribute from attribute set to prevent infinite planning loops
  Update CHANGELOG.md
  use /usr/bin/env bash
  provider/aws: fix go vet
  provider/aws: ignore providers with Meta nil
  update CHANGELOG
  provider/aws: Code cleanups for Spot Requests
  provider/aws: fix db_subnet acc test
  Fixing the tests
  Fixes issue #2568
  Update CHANGELOG.md
  Update CHANGELOG.md
  fixes typo
  Fixed void Azure network config bug.
  provider/aws: ecs task definition is deregistered correctly
  provider/azure: fixup storage service test
  provider/docker: [tests] change images
  ...
2015-06-30 15:26:23 -05:00
Paul Hinze 0d58b94636 Merge pull request #2576 from johnewart/dynamodb_docs
[dynamodb] Update docs and fix the acceptance test accordingly
2015-06-30 14:03:08 -05:00
Paul Hinze 97ee42663b Merge pull request #2533 from hashicorp/b-vpn-connection-protection
provider/aws: nil protection against VPN connections [GH-2144]
2015-06-30 13:40:47 -05:00
John Ewart ca7fe86c67 Update DynamoDB example docs to remove non-key attributes; update test to remove non-key attribute from attribute set to prevent infinite planning loops 2015-06-30 11:38:16 -07:00
Mitchell Hashimoto 0b3d249727 provider/aws: ignore providers with Meta nil
We changed the way validation works for providers so that they aren't
always configured if they have computed attributes. The result is that
sometimes the Configure won't be called, hence Meta is nil
2015-06-30 10:24:53 -07:00
Clint 4f2f9546c3 Merge pull request #2574 from hashicorp/b-aws-spot-request-touchup
provider/aws: Code cleanups for Spot Requests
2015-06-30 09:30:26 -05:00
Clint Shryock c81345f535 provider/aws: Code cleanups for Spot Requests 2015-06-30 09:28:14 -05:00
Paul Hinze 8fa96d2c33 provider/aws: fix db_subnet acc test
AWS accepts uppercase DB Subnet Group names - it just automatically
downcases them. We already had logic to handle that - so we
intentionally had an acctest with uppercase characters that was now
failing.

Loosening the regexp to allow uppercase letters for now - we can discuss
if we want to tighten the validation as a separate question.

/cc @radeksimko @catsby
2015-06-30 09:20:52 -05:00
Radek Simko 676d490d40 provider/aws: Allow elb name to be generated 2015-06-30 13:13:51 +01:00
Radek Simko 8acc55ae13 Merge pull request #2402 from hashicorp/f-aws-ecs-td-deregistration
provider/aws: Deregister ECS task definition correctly
2015-06-30 12:36:58 +01:00
Radek Simko f67410db53 Merge pull request #2534 from dtan4/ec-subnet-group-subnet-ids
Make elasticache_subnet_group subnet_ids as required argument
2015-06-30 08:45:48 +01:00
Radek Simko f5eb581425 provider/aws: ecs task definition is deregistered correctly 2015-06-29 23:37:20 +01:00
Radek Simko 406967e581 Merge pull request #2552 from TimeIncOSS/f-aws-iam-role-validation
provider/aws: Add validation for aws_iam_role_policy.name
2015-06-29 20:39:52 +01:00
Radek Simko ce831e879f Merge pull request #2553 from TimeIncOSS/f-aws-iam-instance-profile-validation
provider/aws: Add validation for aws_iam_instance_profile.name
2015-06-29 20:39:39 +01:00
Clint 791787047f Merge pull request #2395 from GrayCoder/master
Add resource "aws_iam_policy_attachment" to attach a managed policy to users, roles, or groups
2015-06-29 14:33:34 -05:00
Paul Hinze ddc266902b tests: test name consistency 2015-06-29 14:06:55 -05:00
Mitchell Hashimoto 686076526b Merge pull request #2543 from hashicorp/b-elastic-ip-destroy
provider/aws: ignore association not exist on EIP destroy [GH-2295]
2015-06-29 10:35:20 -07:00
Mitchell Hashimoto 4b5b6b6942 Merge pull request #2544 from hashicorp/b-vpc-peer-failed
providers/aws: vpc peering failed == deleted [GH-2322]
2015-06-29 10:35:15 -07:00
Mitchell Hashimoto 63466121f4 Merge pull request #2532 from hashicorp/b-vpc-retry
provider/aws: vpc delete retry on dependency violation [GH-1628]
2015-06-29 10:23:34 -07:00
Mitchell Hashimoto 9c9fe38fd8 Merge pull request #2531 from hashicorp/b-aws-instance-refresh
providers/aws: set AMI on read for instance [GH-1571]
2015-06-29 10:21:30 -07:00
Radek Simko be8d0dea2d provider/aws: Add validation for aws_iam_instance_profile.name 2015-06-29 16:27:35 +01:00
Radek Simko fed64b4fbd provider/aws: Add validation for aws_iam_role_policy.name 2015-06-29 16:23:42 +01:00
Mitchell Hashimoto da1cac623d providers/aws: implement basic fast-path for not being in EC2 for creds 2015-06-28 23:06:49 -07:00
Mitchell Hashimoto 93cedc7ec1 providers/aws: style nitpick 2015-06-28 22:46:49 -07:00
Mitchell Hashimoto 2a5ed6c847 Merge pull request #1841 from josharian/aws-external-creds
providers/aws: detect credentials more robustly
2015-06-28 22:43:56 -07:00
Mitchell Hashimoto e2e8d3746f providers/aws: vpc peering failed == deleted [GH-2322] 2015-06-28 22:35:02 -07:00
Mitchell Hashimoto cc2a5ab18f provider/aws: ignore association not exist on EIP destroy [GH-2295] 2015-06-28 22:30:43 -07:00
Patrick Gray 28506c3750 add composeErrors function to only expose errors that happened 2015-06-28 22:30:54 -04:00
Patrick Gray 0f5c9c012d check length of slices instead of using incorrect type 2015-06-28 20:00:55 -04:00
Patrick Gray c375a72f15 check for empty string instead of nil 2015-06-28 19:39:50 -04:00
Daisuke Fujita 562cf596dc Make elasticache_subnet_group subnet_ids essential 2015-06-28 16:13:25 +09:00
Mitchell Hashimoto 1cc5068b8c provider/aws: nil protection against VPN connections [GH-2144] 2015-06-26 21:22:08 -07:00