Radek Simko
4525119a57
provider/aws: Add validation for aws_security_group (name+description)
2015-06-26 15:10:04 +01:00
Radek Simko
6f2fb0db38
provider/aws: Add validation for aws_elb.name
2015-06-26 15:08:00 +01:00
Radek Simko
3a9852568a
provider/aws: Add validation for aws_db_instance.identifier
2015-06-26 15:06:36 +01:00
Paul Hinze
d82d803690
Merge pull request #2510 from CpuID/cpuid_gh2509
...
default_cooldown change shouldnt force new resource
2015-06-26 08:55:36 -05:00
Paul Hinze
db11d80947
Merge pull request #2515 from aznashwan/f-azure-instance-services
...
provider/azure: Made instances deployable on already existing services.
2015-06-26 08:54:57 -05:00
Paul Hinze
4a14d83733
Merge pull request #2513 from TimeIncOSS/f-aws-validation-db-subnet-group
...
aws: Add validation for aws_db_subnet_group.name
2015-06-26 08:46:39 -05:00
aznashwan
6ea0397e07
Made instances deployable on already existing services.
2015-06-26 15:49:05 +03:00
Radek Simko
f424085f44
provider/aws: Add validation for aws_vpc.cidr_block
...
- closes #2340
2015-06-26 12:44:26 +01:00
Radek Simko
ca83dc2118
provider/aws: Add validation for aws_db_subnet_group.name
2015-06-26 12:39:55 +01:00
Radek Simko
765be4c768
provider/aws: Fix naming in validation of db_instance.final_snapshot_identifier
2015-06-26 12:10:26 +01:00
Nathan Sullivan
4a791c1b41
default_cooldown change shouldnt force new resource - https://github.com/hashicorp/terraform/issues/2509 - credit to
...
@phinze and @mzupan for https://github.com/hashicorp/terraform/pull/2147
2015-06-26 15:51:31 +10:00
Rui Lopes
02791d70df
provider/digitalocean: check if the droplet no longer exists.
2015-06-25 22:17:56 +01:00
aznashwan
1e08c6e72f
Made Azure security group rules - security groups relationship one - many.
2015-06-25 21:57:38 +03:00
Clint
de5df6f378
Merge pull request #2462 from johnewart/dynamodb_throttle
...
dynamodb - Support backing off a bit when throttling / limit-exceeded exceptions happen
2015-06-25 12:29:09 -05:00
Clint Shryock
2e23210e58
poll ElastiCache cluster status on update
2015-06-25 11:10:02 -05:00
Clint Shryock
93a577880b
provider/aws: Allow in-place updates for ElastiCache cluster
2015-06-25 11:09:29 -05:00
Mitchell Hashimoto
25fa84974b
update CHANGELOG
2015-06-25 09:07:11 -07:00
Mitchell Hashimoto
02624118b3
Merge pull request #2489 from joshgarnett/aws_instance_monitoring
...
provider/aws: adding support for detailed monitoring of instances
2015-06-25 09:05:15 -07:00
Mitchell Hashimoto
ecbd5a5013
Merge pull request #2455 from semarj/master
...
dynamodb - only require nonkey attributes on INCLUDE
2015-06-25 09:03:44 -07:00
Jeff Mitchell
edbc578316
As discussed on the issue, remove the hard-coded delay on startup in
...
favor of attempting to detect if the initial container ever enters
running state, and erroring out if not. It will re-check the container
once every 500ms for 15 seconds total; future work could make that
configurable.
2015-06-25 15:11:00 +00:00
Joshua Garnett
d23f534d26
Adding support for detailed monitoring of instances
2015-06-25 10:58:28 -04:00
Jeff Mitchell
56cfba2509
Fix a serious problem when using links.
...
Links cause there to be more than one name for a container to be
returned. As a result, only looking at the first element of the
container names could cause a container to not be found, leading
Terraform to remove it from state and attempt to recreate it.
2015-06-25 14:40:03 +00:00
Jeff Mitchell
2e01e0635b
When linking to other containers, introduce a slight delay; this lets
...
the Docker API get those containers running. Otherwise when
you try to start a container linking to them, the start command
will fail, leading to an error.
2015-06-25 14:40:03 +00:00
Sander van Harmelen
61517f68b1
Add an `ohai_hints` option to upload hint files
...
This option takes a list of hints that will be uploaded to the new node
before starting the initial Chef run.
2015-06-25 16:32:36 +02:00
Joshua Semar
7e05b083d3
include keys only projection type
2015-06-25 09:30:44 -05:00
Sander van Harmelen
4c66df0dbf
Merge pull request #2483 from svanharmelen/f-provisioner-chef-ostype
...
provisioner/chef: add an option to specifically specify the target OS
2015-06-25 16:14:23 +02:00
Clint
7a15090208
Merge pull request #2472 from hashicorp/f-aws-asg-update-elbs
...
provider/aws: Update ASGs to support in-place updates for Load Balancers
2015-06-25 08:55:46 -05:00
Sander van Harmelen
2690d87d39
Add an option to specifically specify the target OS
...
Before this option (`os_type`) the provisioner would use the connection
type to determine the targeted OS. When not supplying a value for
`os_type`, it will fall back to the old behaviour, so this is full BC.
2015-06-25 14:29:48 +02:00
Joshua Semar
46fed750a5
simple acc test covering more projection types
2015-06-25 03:38:17 -05:00
Sander van Harmelen
b7b770d0da
Update user date size check
...
This makes sure we check the right thing.
2015-06-25 09:45:39 +02:00
Sander van Harmelen
0d36c24c54
Merge pull request #2391 from chiradeep/master
...
increase allowed size of userdata for cloudstack provider
2015-06-25 09:39:04 +02:00
Mitchell Hashimoto
ebc33d874a
providers/openstack: fix vet issue
2015-06-24 23:16:06 -07:00
Mitchell Hashimoto
ede6af8763
Merge pull request #1921 from jtopjian/openstack-servergroup-schedulerhints
...
provider/openstack: scheduler_hints and servergroups
2015-06-24 23:13:25 -07:00
Mitchell Hashimoto
d1d2a90158
Revert "provider/openstack: change security groups to set"
...
This reverts commit 646fd76e07
.
2015-06-24 23:10:30 -07:00
Mitchell Hashimoto
38151229b1
Merge pull request #2285 from cvvs/b_provider_openstack_router_adminbool
...
provider/openstack: change router resource admin_state_up from string to bool
2015-06-24 23:09:14 -07:00
Radek Simko
dc26f06b5f
Merge pull request #2410 from TimeIncOSS/f-aws-lc-monitoring
...
provider/aws: Add aws_launch_configuration.enable_monitoring
2015-06-25 07:02:56 +01:00
Mitchell Hashimoto
a4070a1972
Merge pull request #2452 from zollie/f-aws-launch-configuration-profile-propagation-wait
...
provider/aws: Add retry to aws_launch_configuration Create to wait for IAM instance profile propagation
2015-06-24 22:59:42 -07:00
Clint Shryock
6e818785af
provider/aws: Update ASGs to support in-place updates for Load Balancers
2015-06-24 16:37:23 -05:00
zollie
579b33b8a2
Retry aws_launch_configuration Create on 'Invalid IamInstanceProfile' error only
2015-06-24 17:11:46 -04:00
Radek Simko
6fdbca8e58
Merge pull request #2466 from TimeIncOSS/f-schema-field-name-validate
...
schema: Add field name to ValidateFunc
2015-06-24 18:52:53 +01:00
Mitchell Hashimoto
9fc78d4ea1
Merge pull request #2448 from hashicorp/b-openstack-networks
...
providers/openstack: fix crash case if network is nil [GH-2323]
2015-06-24 10:38:27 -07:00
Mitchell Hashimoto
232916a4de
Merge pull request #2449 from hashicorp/b-aws-sg-crash
...
providers/aws: more guards against crashy cases [GH-2308]
2015-06-24 10:35:04 -07:00
Radek Simko
92db4802b6
schema: Add field name to ValidateFunc
2015-06-24 18:22:12 +01:00
John Ewart
fd98cae9cc
Increment attemptCount when a LimitExceededException occurs
2015-06-24 07:36:14 -07:00
John Ewart
7718cd194c
Support backing off a bit when throttling / limit-exceeded exceptions happen
2015-06-24 07:25:00 -07:00
Mitchell Hashimoto
fef5741ded
providers/aws: fix another crash case
2015-06-23 22:48:39 -07:00
Mitchell Hashimoto
cddd54c3de
fmt
2015-06-23 22:31:24 -07:00
Joshua Semar
7948aa720e
dynamodb - only require nonkey attributes on INCLUDE
2015-06-23 23:50:29 -05:00
zollie
079a26a655
Wrapped Create in a resource.Retry to wait for IAM instance profile propagation
2015-06-23 22:14:53 -04:00
Mitchell Hashimoto
b0169adf02
providers/aws: more guards against crashy cases [GH-2308]
2015-06-23 16:23:24 -07:00
Mitchell Hashimoto
09acd1f79d
providers/openstack: fix crash case if network is nil [GH-2323]
2015-06-23 16:19:42 -07:00
Radek Simko
5cf5451d28
Merge pull request #1999 from TimeIncOSS/r53-delegation-set
...
provider/aws: Add Route 53 delegation set resource
2015-06-23 22:51:47 +01:00
Clint
24c4c55511
Merge pull request #2384 from hashicorp/f-aws-flow-logs
...
provider/aws: Add FlowLog resource
2015-06-23 15:08:00 -05:00
Paul Hinze
7d26e1408a
Merge pull request #2434 from hashicorp/b-sg-rule-crash
...
provider/aws: fix sg rule crash
2015-06-23 15:01:35 -05:00
Paul Hinze
95235ba2cc
Merge pull request #2374 from hashicorp/b-aws-detect-instance-type-drift
...
provider/aws: detect instance_type drift on aws_instance
2015-06-23 15:01:20 -05:00
Paul Hinze
e0fccf2dcc
provider/aws: fix sg rule crash
...
Fixes crash in #2431
Decided that `findResourceSecurityGroup` should return an error when
the SG is not found, since the callers cannot happily continue with a
`nil` SG
Also passes through a few error cases that were being swallowed.
/cc @catsby
2015-06-23 09:25:55 -05:00
Paul Hinze
020dc03234
provider/aws: fix root_block_device for odd AMIs
...
Some AMIs have a RootDeviceName like "/dev/sda1" that does not appear as a
DeviceName in the BlockDeviceMapping list (which will instead have
something like "/dev/sda")
While this seems like it breaks an invariant of AMIs, it ends up working
on the AWS side, and AMIs like this are common enough that we need to
special case it so Terraform does the right thing.
Our heuristic is: if the RootDeviceName does not appear in the
BlockDeviceMapping, assume that the DeviceName of the first
BlockDeviceMapping entry serves as the root device.
fixes #2224
2015-06-23 09:01:41 -05:00
Paul Hinze
cde64727f3
Merge pull request #2411 from Jberlinsky/master
...
Improve idempotency of aws_iam_server_certificate provisioning
2015-06-22 18:12:49 -05:00
Paul Hinze
aa8cf572a8
Merge pull request #2265 from hashicorp/f-schema-validate-field
...
Support arbitrary per-field schema validation
2015-06-22 18:01:54 -05:00
Clint Shryock
cc43ae8c4b
Merge branch 'master' into f-aws-flow-logs
...
* master:
Update CHANGELOG.md
Update CHANGELOG.md
Added affinity group resource.
update link to actually work
provider/azure: Fix SQL client name to match upstream
add warning message to explain scenario of conflicting rules
typo
remove debugging
Update CHANGELOG.md
provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
provider/aws: Add autoscaling_policy
provider/aws: Add cloudwatch_metric_alarm
rename method, update docs
clean up some conflicts with
clean up old, incompatible test
update tests with another example
update test
remove meta usage, stub test
fix existing tests
Consider security groups with source security groups when hashing
2015-06-22 09:33:42 -05:00
Clint Shryock
87c7f6337d
remove flow/deliver log status attributes
2015-06-22 09:31:37 -05:00
Jason Berlinsky
06e2336467
Replace AWS IAM test SSL certificate with self-signed cert, including CA chain
2015-06-21 01:40:29 -04:00
Jason Berlinsky
a7b31ac40d
Normalize certificate chains as well as certificate bodies when creating AWS IAM SSL certificates
2015-06-21 01:40:09 -04:00
Radek Simko
cbddab8a69
provider/aws: Add aws_launch_configuration.enable_monitoring
2015-06-20 23:40:29 +01:00
aznashwan
9b5c99ba28
Added affinity group resource.
2015-06-19 21:53:36 +03:00
Clint Shryock
44eb55f8f6
update link to actually work
2015-06-19 11:50:10 -05:00
Clint Shryock
d2176b2d7e
Merge branch 'master' into jszwedko-fix-sg
...
* master:
provider/azure: Fix SQL client name to match upstream
2015-06-19 11:40:50 -05:00
Clint Shryock
2410824fc9
provider/azure: Fix SQL client name to match upstream
...
name was changed in 4f4636621e
2015-06-19 11:39:50 -05:00
Clint Shryock
a3cbb74a2e
Merge branch 'master' into jszwedko-fix-sg
...
* master: (23 commits)
typo
Update CHANGELOG.md
provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
provider/aws: Add autoscaling_policy
provider/aws: Add cloudwatch_metric_alarm
Update CHANGELOG.md
Update CHANGELOG.md
provider/template: don't error when rendering fails in Exists
Update CHANGELOG.md
Added Azure SQL server and service support.
Update CHANGELOG.md
docs: clarify wording around destroy/apply args
Getting Started: Added a Next Step upon finishing install.
docs: add description of archive format to download page
docs: snapshot plugin dependencies when releasing
add v0.5.3 transitory deps
Fixes support for changing just the read / write capacity of a GSI
Change sleep time for DynamoDB table waits from 3 seconds to 5 seconds
Remove request for attribute changes
Fix AWS SDK imports
...
2015-06-19 11:31:41 -05:00
Clint Shryock
645a5aa55b
add warning message to explain scenario of conflicting rules
2015-06-19 11:23:59 -05:00
Paul Hinze
611741c108
typo
2015-06-18 15:47:54 -05:00
Chiradeep Vittal
f8d190f537
fix compile error not caught by 'make dev'
2015-06-18 10:45:15 -07:00
Patrick Gray
24e2cfb260
test works
2015-06-18 11:10:14 -04:00
Patrick Gray
3266c44b83
rename to more intuitive name and finish tests
2015-06-18 10:53:52 -04:00
Clint Shryock
24ee2e5d53
remove debugging
2015-06-18 08:39:08 -05:00
Clint Shryock
0bf127a805
update test; fix import, interpolate ENV var for log name
2015-06-18 08:35:45 -05:00
Clint Shryock
285a88b664
code cleanups
2015-06-18 08:28:38 -05:00
Chiradeep Vittal
139500e076
increase allowed size of userdata for cloudstack provider
2015-06-17 15:41:25 -07:00
Radek Simko
1411435179
provider/aws: Add support for delegation_set to route53_hosted_zone
2015-06-17 23:24:41 +01:00
Radek Simko
bfd8226b89
provider/aws: Add route53_delegation_set
2015-06-17 23:24:41 +01:00
Alex Pilon
14f4e5fe54
provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
2015-06-17 23:10:23 +01:00
Alex Pilon
05f4b9bfd9
provider/aws: Add autoscaling_policy
2015-06-17 23:10:23 +01:00
Alex Pilon
ceeb94e157
provider/aws: Add cloudwatch_metric_alarm
2015-06-17 23:10:23 +01:00
Clint Shryock
b3d7bb2b39
fix go vet error
2015-06-17 16:45:14 -05:00
Clint Shryock
1a6aef0ed7
Log Group Name is required/forcenew
2015-06-17 16:33:24 -05:00
Clint Shryock
bfdf11c477
provider/aws: Implement AWS Flow Logs
2015-06-17 16:31:21 -05:00
Paul Hinze
5e86e709bc
Merge pull request #2386 from hashicorp/b-template-variable-change-failure
...
provider/template: don't error when rendering fails in Exists
2015-06-17 15:36:11 -05:00
Paul Hinze
385b17d679
provider/template: don't error when rendering fails in Exists
...
The Exists function can run in a context where the contents of the
template have changed, but it uses the old set of variables from the
state. This means that when the set of variables changes, rendering will
fail in Exists. This was returning an error, but really it just needs to
be treated as a scenario where the template needs re-rendering.
fixes #2344 and possibly a few other template issues floating around
2015-06-17 15:33:07 -05:00
Patrick Gray
7bf27daa64
seems to work
2015-06-17 15:21:41 -04:00
aznashwan
357ed8e774
Added Azure SQL server and service support.
2015-06-17 21:23:16 +03:00
Patrick Gray
2135ff02b7
add works but need tests
2015-06-17 10:56:33 -04:00
Clint
b132dd284e
Merge pull request #2121 from johnewart/dynamodb
...
DynamoDB Support
2015-06-17 09:47:13 -05:00
Clint Shryock
640836ee58
rename method, update docs
2015-06-17 09:35:50 -05:00
Clint Shryock
359826be26
clean up some conflicts with
2015-06-16 16:38:26 -05:00
Clint Shryock
c1cdac1f76
clean up old, incompatible test
2015-06-16 16:30:33 -05:00
Clint Shryock
3bf89fb81e
update tests with another example
2015-06-16 16:21:46 -05:00
Clint Shryock
2d06c81e4b
update test
2015-06-16 16:15:07 -05:00
Clint Shryock
b25fb8a55d
remove meta usage, stub test
2015-06-16 15:54:27 -05:00
Patrick Gray
73e8191983
add to provider
2015-06-16 16:10:45 -04:00
Clint Shryock
8a21bd23ea
fix existing tests
2015-06-16 15:09:33 -05:00
Jesse Szwedko
7e0a340baf
Consider security groups with source security groups when hashing
...
Previously they would conflict you had multiple security group rules
with the same ingress or egress ports but different source security
groups because only the CIDR blocks were considered (which are empty
when using source security groups).
Updated to include migrations (from clint@ctshryock.com )
Signed-off-by: Clint Shryock <clint@ctshryock.com>
2015-06-16 14:54:16 -05:00
Paul Hinze
35819b7ae1
provider/aws: detect instance_type drift on aws_instance
...
fixes #2365
2015-06-16 13:23:50 -05:00
aznashwan
58dd568da9
Cleaned up client creation and handling.
2015-06-16 21:04:35 +03:00
John Ewart
4e219b3bad
Fixes support for changing just the read / write capacity of a GSI
2015-06-15 17:05:50 -07:00
Paul Hinze
924278c33f
Merge pull request #2226 from Banno/add-aws-route53-health-checks-squashed
...
provider/aws: add aws_route53_health_check (rebase,squash+docs)
2015-06-15 11:06:03 -05:00
Paul Hinze
1ebe117085
Merge pull request #2052 from aznashwan/azure
...
provider/azure: added a number of storage and networking resources.
2015-06-12 16:49:36 -05:00
Jeff Mitchell
0558763f87
This puts the image parsing code (mostly) back to how it was before. The
...
regex solution is extremely complex, which makes it hard to debug and
understand; the original switches and
commenting lay out the various cases in a straightforward fashion. Plus,
implementing namespace/repo support in the original code was a simple
strings.Join call.
2015-06-12 19:36:52 +00:00
aznashwan
82a7f08a86
Removed redundant casting checks.
2015-06-12 22:25:03 +03:00
aznashwan
bd371a3c40
Removed obsolete TODO's.
2015-06-12 20:57:25 +03:00
Chris Bednarski
380f3ceb86
Merge pull request #2170 from hashicorp/f-aws-lambda
...
AWS Lambda functionality
2015-06-12 10:18:27 -07:00
Patrick Gray
2b7e3d0b51
commit create and delete with a start of test
2015-06-12 12:44:35 -04:00
Dan Paquette
ccf41461a4
provider/aws: add ah and esp protocol integers for network acls and
...
security groups
2015-06-11 23:23:42 -04:00
aznashwan
ebfbef0d52
Added Storage Queue resource.
2015-06-12 01:55:43 +03:00
aznashwan
137cb9778e
Minor fixups, refactors and test updates.
2015-06-11 21:27:40 +03:00
aznashwan
9670e69613
Merge resources unto upstream.
2015-06-11 21:27:40 +03:00
Paul Hinze
35eb5e6395
Merge pull request #2311 from hashicorp/b-aws-empty-vpc-sgs
...
provider/aws: ignore empty vpc_security_group_ids
2015-06-11 08:49:01 -05:00
Clint
54c74becf2
Merge pull request #2305 from hashicorp/b-aws-sg-rule-self
...
provider/aws: Fix Security Group Rule self reference bug
2015-06-11 08:44:41 -05:00
Paul Hinze
d41c9d46a8
provider/aws: ignore empty vpc_security_group_ids
...
fixes #2293
2015-06-11 07:59:42 -05:00
Clint Shryock
9885ac8689
provider/aws: Fix issue with associating KeyPairs with Instances
2015-06-10 14:02:26 -05:00
Clint Shryock
1b80674c92
Merge remote-tracking branch 'upstream/master' into b-aws-sg-rule-self
...
* upstream/master:
Correct syntax error in group membership test.
Add beta compute client
2015-06-10 09:41:26 -05:00
Clint Shryock
5c50ba0c2a
provider/aws: Fix SG rule self reference bug
2015-06-10 09:40:05 -05:00
Clint Shryock
bf3dd5241a
Add failing test for #1985
2015-06-10 09:38:11 -05:00
Radek Simko
1693728c32
Merge pull request #2299 from michaeltchapman/syntax_fix
...
Correct syntax error in group membership test.
2015-06-10 10:07:27 +01:00
Michael Chapman
02e3d30aac
Correct syntax error in group membership test.
...
Fixes #2300 . Regression in 4d59019288
2015-06-10 15:29:22 +10:00
Dave Cunningham
b222499ee0
Add beta compute client
2015-06-10 00:14:13 -04:00
Chris Bednarski
6591603a00
Expand filename if it starts with ~
2015-06-09 12:27:40 -07:00
Chris Bednarski
06dcbae085
Remove sleep from test
2015-06-09 12:13:32 -07:00
Chris Bednarski
f01154366a
Merge with changes from master
2015-06-09 12:12:47 -07:00
cvvs
eabaf8a088
provider/openstack: openstack router admin state
...
Change openstack router resource admin state from a string to a
boolean.
Same technique as mitchellh's fix in
https://github.com/hashicorp/terraform/pull/1745
2015-06-09 10:25:54 -06:00
cvvs
646fd76e07
provider/openstack: change security groups to set
...
This commit converts the openstack compute instances security groups to
a set from a list.
This fixes ordering problems which forces or indicates change to security
groups where none exist, and mimics the functionality in the aws
provider's compute resource.
Includes fixes from dupuy addressing crashes due to an empty state.
2015-06-09 10:04:06 -06:00
Clint
05e06d4afd
Merge pull request #2273 from hashicorp/f-aws-iam-group-membership
...
provider/aws: Add IAMGroupMembership resource
2015-06-09 09:42:33 -05:00
Clint Shryock
4d59019288
code cleanups
2015-06-09 09:11:05 -05:00
Sander van Harmelen
aed44622b1
Merge pull request #2281 from svanharmelen/f-provider-cloudstack
...
provider/cloudstack: updating and tweaking tests and docs
2015-06-09 12:44:22 +02:00
Sander van Harmelen
c9d3b988bc
provider/cloudstack: updating and tweaking tests and docs
...
Making sure everything is up-to-spec again and all tests run flawless,
after merging in some new functionality.
2015-06-09 12:38:05 +02:00
John Ewart
320e4b222c
Change sleep time for DynamoDB table waits from 3 seconds to 5 seconds
2015-06-08 16:04:22 -07:00
John Ewart
f458521be9
Remove request for attribute changes
2015-06-08 16:02:20 -07:00
Clint Shryock
5f1ab2a953
fix typo
2015-06-08 16:21:07 -05:00
Sam Clinckspoor
7b559a9a24
added extra test for structure
2015-06-08 23:06:32 +02:00
Sam Clinckspoor
7f9c4e45ea
added test
2015-06-08 22:43:39 +02:00
Clint Shryock
96a28a092a
update aws_iam_group_membership to provide update functionality
2015-06-08 15:01:23 -05:00
Clint Shryock
6b57f29570
refactor to support multi users
2015-06-08 14:20:39 -05:00
Sam Clinckspoor
14b7dd3477
add resource file
2015-06-08 21:05:25 +02:00
Sam Clinckspoor
a6010e6317
frist commit for aws_elasticahce_parameter_group
2015-06-08 21:05:00 +02:00
Clint
a39516c0eb
Merge pull request #2177 from hashicorp/b-aws-iam-role-profile-update
...
provider/aws: Remove roles from profiles when trying to delete
2015-06-08 13:08:26 -05:00
Paul Hinze
60a5d11fa8
provider/aws: remove default from associate_public_ip_address
...
I snuck this in with #2263 because thought it was simply a stylistic
clarity thing, but it actually generates a resource-replacement-forcing
diff for existing resources that don't have this set in the config.
Definitely don't want that. :P
/cc @catsby
2015-06-08 12:39:36 -05:00
Clint Shryock
f31891fa5e
provider/aws: Add IAMGroupMembership resource
...
bare bones implementation of a Group Membership resource
2015-06-08 11:26:47 -05:00
Sander van Harmelen
ec5cef4de8
Merge pull request #2115 from jalemieux/master
...
provider/cloudstack: add project support for CloudStack Instances
2015-06-08 17:34:24 +02:00
Paul Hinze
e305d7c5df
Merge pull request #2263 from hashicorp/f-aws-spot-instance-request
...
provider/aws: spot_instance_request
2015-06-08 10:29:58 -05:00
Clint Shryock
35047dbc9f
Merge branch 'master' into b-aws-iam-role-profile-update
...
* master: (91 commits)
update CHANGELOG
update CHANGELOG
state/remote: more canonical Go for skip TLS verify
update CHANGELOG
update CHANGELOG
command/apply: flatten multierrors
provider/aws: improve iam_policy err msgs
acc tests: ensure each resource has a _basic test
aws/provider convert _normal tests to _basic
go fmt
Enpoint type configuration for OpenStack provider
Fix page title for aws_elasticache_cluster
Update CHANGELOG.md
Corrected Frankfurt S3 Website Endpoint fixes #2258
Only run Swift tests when Swift is available
Implement OpenStack/Swift remote
Minor correction to aws_s3_bucket docs
docs: Fix wrong title (aws_autoscaling_notification)
provider/aws: clarify scaling timeout error
Update CHANGELOG.md
...
2015-06-08 08:52:38 -05:00
Paul Hinze
37b234e42b
provider/aws: validate RDS final_snapshot_identifier
...
fixes #2250
2015-06-08 08:50:56 -05:00
Mitchell Hashimoto
8748a86e60
Merge pull request #2160 from grubernaut/elasticache_port_required
...
provider/aws: Set AWS Elasticache Port Number to be required
2015-06-07 22:27:59 -07:00
Mitchell Hashimoto
27acb45522
Merge pull request #2262 from ggiamarchi/openstack/endpoint_type
...
Openstack / Add endpoint type provider configuration
2015-06-07 22:12:32 -07:00
Mitchell Hashimoto
b0241541c2
Merge pull request #2264 from hashicorp/r-basic-resource-tests
...
acc tests: ensure each resource has a _basic test
2015-06-07 22:11:48 -07:00
Paul Hinze
f4f5139f22
provider/aws: improve iam_policy err msgs
...
Turns out `%s` outputs nicer than `%#v` here.
Closes #2247
2015-06-07 20:58:22 -05:00
Paul Hinze
84afeb73b1
acc tests: ensure each resource has a _basic test
...
Helpful for breadth first acc test sweeps `-run '_basic$'`
2015-06-07 18:18:14 -05:00
Paul Hinze
66c51d44f6
aws/provider convert _normal tests to _basic
...
For consistency!
2015-06-07 18:04:38 -05:00
Paul Hinze
112724fc39
provider/aws: spot_instance_request
...
This is an iteration on the great work done by @dalehamel in PRs #2095
and #2109 .
The core team went back and forth on how to best model Spot Instance
Requests, requesting and then rejecting a separate-resource
implementation in #2109 .
After more internal discussion, we landed once again on a separate
resource to model Spot Instance Requests. Out of respect for
@dalehamel's already-significant donated time, with this I'm attempting
to pick up the work to take this across the finish line.
Important architectural decisions represented here:
* Spot Instance Requests are always of type "persistent", to properly
match Terraform's declarative model.
* The spot_instance_request resource exports several attributes that
are expected to be constantly changing as the spot market changes:
spot_bid_status, spot_request_state, and instance_id. Creating
additional resource dependencies based on these attributes is not
recommended, as Terraform diffs will be continually generated to keep
up with the live changes.
* When a Spot Instance Request is deleted/canceled, an attempt is made
to terminate the last-known attached spot instance. Race conditions
dictate that this attempt cannot guarantee that the associated spot
instance is terminated immediately.
Implementation notes:
* This version of aws_spot_instance_request borrows a lot of common
code from aws_instance.
* In order to facilitate borrowing, we introduce `awsInstanceOpts`, an
internal representation of instance details that's meant to be shared
between resources. The goal here would be to refactor ASG Launch
Configurations to use the same struct.
* The new aws_spot_instance_request acc. test is passing.
* All aws_instance acc. tests remain passing.
2015-06-07 17:33:32 -05:00
Guillaume Giamarchi
8d26e10aba
go fmt
2015-06-07 23:50:51 +02:00
Guillaume Giamarchi
e04a6cacc5
Enpoint type configuration for OpenStack provider
...
Add the possibility to specify the endpoint type
(public, admin, internal). The default remains the
same (public).
2015-06-07 23:50:34 +02:00
Aaron Welch
07ad320960
Packet bare metal cloud hosting platform provider
2015-06-07 16:34:08 -04:00
Alexander Ekdahl
52a21f3fb0
Corrected Frankfurt S3 Website Endpoint fixes #2258
2015-06-07 11:39:18 +02:00
Clint
e2cefe290d
Merge pull request #2232 from justnom/master
...
Fixing bugs with `aws_network_interface` and added docs.
2015-06-05 16:24:14 -05:00
Jack Pearkes
6c29671561
provider/aws: clarify scaling timeout error
...
This just gives the user a better hint to why their scaling may have timed out.
2015-06-05 17:14:21 -04:00
Clint
e172508788
Merge pull request #2197 from hashicorp/f-aws-asg-notifications
...
provider/aws: ASG Notifications Resource
2015-06-05 16:04:19 -05:00
Radek Simko
1770713633
Merge pull request #1803 from TimeIncOSS/ecs
...
aws: Add support for ECS (Container Service)
2015-06-05 22:25:41 +02:00
Paul Hinze
834fda764f
Merge pull request #2234 from trumant/os_auth_token
...
Fixes #2212 by allowing OS_AUTH_TOKEN to set api_key config value
2015-06-05 13:12:17 -05:00
Paul Hinze
f65cce478b
provider/aws: fix case in ELB listener protocols
...
fixes #2242
2015-06-05 10:20:07 -05:00
Clint Shryock
d65c8a421a
refactor the internals of this
2015-06-05 10:00:39 -05:00
Clint Shryock
5e6b0166af
provider/aws: Add ASG SNS Notification top level resource
...
- works with multiple asgs
2015-06-04 16:54:01 -05:00
Travis Truman
7fe29efc1d
Fixes #2212 by allowing OS_AUTH_TOKEN to set api_key config value
2015-06-04 14:27:18 -04:00
Paul Hinze
e2e2cd097e
Merge pull request #2231 from svanharmelen/b-fixup-tests
...
provider/azure: update/fix the CheckDestroy functions in the tests
2015-06-04 11:15:30 -05:00
justnom
aed17f8658
Fixing bugs with `aws_network_interface` and added docs.
...
When a user tried to create an `aws_network_interface` resource without specifying the `private_ips` or `security_groups` attributes the API call to AWS would fail with a 500 HTTP error. Length checks have been put in place for both of these attributes before they are added to the `ec2.CreateNetworkInterfaceInput` struct.
Documentation was also added for the `aws_network_interface` resource.
2015-06-04 11:44:33 -04:00
Sander van Harmelen
69736f67a6
Update/fix the CheckDestroy functions in the tests
2015-06-04 17:11:07 +02:00
Mitchell Hashimoto
058e174c4d
Merge pull request #2227 from juls/docker-privileged-option
...
provider/docker: Add privileged option
2015-06-04 16:15:16 +02:00
Sander van Harmelen
01f101f0e1
Merge pull request #2206 from svanharmelen/b-provisioner-chef
...
provisioner/chef: improve the decoding logic to prevent parameter not found errors
2015-06-04 15:50:47 +02:00
Julian Schneider
b9a437658e
Add privileged option to docker container resource
2015-06-04 13:05:52 +02:00
Trent Johnson
054a40475c
provider/aws: add aws_route53_health_check
2015-06-04 05:58:45 -05:00
Sander van Harmelen
1b4b73c2e1
Merge pull request #2211 from benjvi/ova-template
...
Cloudstack - allow OVA template upload
2015-06-04 11:20:37 +02:00
John Ewart
4784eff9ca
Fix AWS SDK imports
2015-06-03 17:12:41 -07:00
John Ewart
1669c35007
Adding DynamoDB acceptance tests
2015-06-03 17:05:40 -07:00
John Ewart
34e9e31377
Adding DynamoDB resource
2015-06-03 17:05:02 -07:00
Clint Shryock
2a0dc4e277
don't set this, it messes things up
2015-06-03 17:10:07 -05:00
Radek Simko
ebaa9bde2a
provider/aws: Add new resource - aws_ecs_service
2015-06-03 22:48:17 +01:00
Radek Simko
87faf855aa
provider/aws: Add new resource - aws_ecs_task_definition
2015-06-03 22:47:32 +01:00
Radek Simko
ae5502b744
provider/aws: Add new resource - aws_ecs_cluster
2015-06-03 22:47:05 +01:00
Clint Shryock
fcd89828f9
provider/aws: Correctly default Instance source_dest_check to true
2015-06-03 15:54:01 -05:00
Paul Hinze
1caef3031b
provider/aws: fix panic when route has no cidr_block
...
While cidr_block is required for static route creation, there are
apparently cases (involving some combination of VPNs, Customer Gateways,
and automatic route propogation) where the cidr_block can come back nil.
This means we cannot assume it's there in the set hash calculation.
2015-06-03 13:43:05 -05:00
Paul Hinze
b71fa3d0ae
provider/aws: handle upstream aws-sdk-go repo move
...
`awslabs/aws-sdk-go => aws/aws-sdk-go`
Congrats to upstream on the promotion. :)
2015-06-03 13:36:57 -05:00
Jacques Lemieux
1d9df96fc1
typo
2015-06-03 11:25:07 -07:00
benjvi
bfcf5cd3d1
Cloudstack - allow OVA template upload
2015-06-03 16:46:56 +01:00
Clint Shryock
de141fe1cc
provider/aws: Updates to SNS / SQS resources after upstream change
2015-06-03 08:46:03 -05:00
Sander van Harmelen
4f6e610ff9
Improve the decoding logic to prevent parameter not found errors
...
We need to decode both the Raw config and the parsed Config to make
sure all set keys are visible. Otherwise keys that will need to be
interpolated later, will be missing causing the validation to fail.
2015-06-03 14:45:30 +02:00
Clint
a42413fa5c
Merge pull request #2191 from hashicorp/b-aws-elasticache-subnet-updates
...
provider/aws: Allow ElastiCache Subnet Group updates
2015-06-02 14:30:37 -05:00
Sander van Harmelen
7aeaa344b0
Merge pull request #2004 from benjvi/sshkey
...
provider/cloudstack: add SSH keypair resource
2015-06-02 21:28:16 +02:00
Sander van Harmelen
31ae2482d5
Merge pull request #2053 from svanharmelen/f-provider-azure
...
WIP: Add Azure provider (peer-review PR)
2015-06-02 21:17:03 +02:00
Sander van Harmelen
7e388bb078
Make sure we expand the homedir
...
If a tilde is used in the path, this makes sure we expand it to a full
path.
2015-06-02 21:08:14 +02:00
Benjamin vickers
5e9d385f96
Add cloudstack ssh key resource and attr for instances
2015-06-02 17:24:17 +01:00
Clint Shryock
a2717acf81
provider/aws: Allow ElastiCache Subnet Group updates
...
Adds update method for ElastiCache Subnet Groups, things are not all ForceNew
anymore.
- can update description
- can update subnet ids
2015-06-02 11:19:23 -05:00
Jacques Lemieux
6c7f632c22
added test creating instance with project id, added const in provider_test
2015-06-01 18:01:28 -07:00
Jacques Lemieux
5687045f10
added test for instance creation with project name
2015-06-01 17:56:43 -07:00
Clint Shryock
015c111a3d
provider/aws: Remove roles from profiles when trying to delete
2015-06-01 15:47:14 -05:00
Paul Hinze
e84203a2dc
provider/aws: remove asg test dependence on default SG
...
accidentally pushed this with an implicit dependency on the default SG
and VPC
2015-06-01 12:12:49 -05:00
Chris Bednarski
6986121305
AWS Lambda functionality
...
- Includes documentation
- Includes acceptance tests
2015-06-01 09:33:45 -07:00
Dave Cunningham
265b9b254e
Merge pull request #2060 from alphagov/f-add-google-cloud-storage
...
Feature: add google cloud storage
2015-06-01 12:10:07 -04:00
Clint Shryock
6242f49af7
provider/aws: Update hash of network acl tests
2015-06-01 09:12:17 -05:00
Paul Hinze
6a8456c911
Merge pull request #2168 from svanharmelen/b-chef-provisioner-interpolation
...
provisioner/chef: fix interpolation in the Chef provisioner
2015-06-01 09:02:00 -05:00
Clint
ceca4ef9aa
Merge pull request #2148 from hashicorp/b-aws-netacl-icmp-support
...
provider/aws: Add support for ICMP Protocol in Network ACLs
2015-06-01 08:33:06 -05:00
Sander van Harmelen
be56a3a02e
Fix interpolation in the Chef provisioner
...
Turns out to be a pretty obvious bug with a simple fix…
2015-06-01 15:29:43 +02:00
Dan Hilton
b909f7826b
provider/google: Add support for Google Compute Stogare buckets.
...
Configure Google Compute Storage buckets using:
* name (compulsory attribute)
* predefined_acl (optional, default: `projectPrivate`)
* location (optional, default: `US`)
* force_destroy (optional, default: `false`)
Currently supporting only `predefined_acl`s. Bucket attribute updates happen via re-creation. force_destroy will cause bucket objects to be purged, enabling bucket destruction.
2015-06-01 11:36:50 +01:00
Sander van Harmelen
120599e68f
Add some additional checks
2015-06-01 11:18:48 +02:00
Jake Champlin
b236cdf918
Set AWS Elasticache Port Number to be required
...
Set Elasticache Port number to not be set by default, and require
Elasticache Port number to be specified.
Also updated acceptance tests to supply port number upon resource
declaration
Fixes #2084
2015-05-31 18:01:07 -04:00
Paul Hinze
060e8882bd
Merge pull request #2147 from mzupan/fix-asg-health-checkswitch
...
Switching the healthcheck shouldn't cause a refresh of the resource
2015-05-30 07:10:56 -05:00
Mike Zupan
e7fa855174
making the update happen
2015-05-30 02:51:56 -07:00
Clint
c4af5b2e9a
Merge pull request #2120 from hashicorp/b-aws-instance-ebs-snapshot
...
provider/aws: Fix issue with restoring from snapshot ID
2015-05-29 17:07:01 -05:00
Clint Shryock
339f2bd21f
provider/aws: Add support for ICMP Protocol in Network ACLs
...
- added icmp_type attribute
- added icmp_code attribute
- fixed an issue hiding the error
2015-05-29 16:48:50 -05:00
Mike Zupan
c122323d14
Switching the healthcheck shouldn't cause a refresh of the resource
...
Switching the healthcheck from elb->ec2 or ec2->elb shouldn't cause the ASG to re-create itself
2015-05-29 13:40:15 -07:00
Clint
4cd8147340
Merge pull request #2110 from hashicorp/f-aws-kinesis
...
provider/aws: AWS Kinesis Stream support
2015-05-29 10:37:29 -05:00
Clint
f536df7aff
Merge pull request #2128 from hashicorp/f-aws-elasticache-check-nodes
...
provider/aws: Check ElastiCache node status before returning
2015-05-29 10:20:02 -05:00
Clint Shryock
c95557af27
Check node length to match expected node count
2015-05-29 10:09:54 -05:00
Clint Shryock
9a1ae44475
provider/aws: Cleanups on Kinesis naming
2015-05-29 09:40:34 -05:00
Radek Simko
01399f3240
Add tags to EBS volumes
2015-05-29 12:39:20 +01:00
Sander van Harmelen
2e1463ba0f
Merge pull request #2133 from hashicorp/b-volumn-error-params
...
go vet caught wrong number of params passed to error message
2015-05-29 10:38:20 +02:00
Sander van Harmelen
08dd7dece9
Very minor change needed to realign with the updated Azure SDK
2015-05-29 10:17:43 +02:00
Chris Bednarski
3768bdeae1
Updated the names for autoscaling to match breaking changes in upstream
...
AutoScalingGroup -> Group
04d1270245
2015-05-29 00:55:59 -07:00
Chris Bednarski
d9551866f4
go vet caught wrong number of params passed to error message
2015-05-28 21:21:52 -07:00
Jacques Lemieux
7e49714c3d
fixed project schema, added project support to retrieveUUID
2015-05-28 18:41:58 -07:00
Clint Shryock
8a4cbcb5a2
provider/aws: Check ElastiCache node status before returning
2015-05-28 17:36:21 -05:00
Sander van Harmelen
cef8259923
Adding the last parts of the docs for the new Azure provider
...
Next to the remaining docs, I also updated the code so any Virtual
Network related API calls are now synchronised by using a mutex (thanks
@aznashwan for pointing that out!).
2015-05-29 00:10:21 +02:00
Clint Shryock
db8805dfa5
provider/aws: Fix issue with restoring from snapshot ID
...
Fixes #1862
2015-05-28 11:25:13 -05:00
Clint Shryock
3f68ea7d0e
Merge remote-tracking branch 'upstream/master' into f-aws-volume-attachment
...
* upstream/master: (21 commits)
fix typo
fix typo, use awslabs/aws-sdk-go
Update CHANGELOG.md
More internal links in template documentation.
providers/aws: Requires ttl and records attributes if there isn't an ALIAS block.
Condense switch fallthroughs into expr lists
Fix docs for aws_route53_record params
Update CHANGELOG.md
provider/aws: Add IAM Server Certificate resource
aws_db_instance docs updated per #2070
providers/aws: Adds link to AWS docs about RDS parameters.
Downgrade middleman to 3.3.12 as 3.3.13 does not exist
providers/aws: Clarifies db_security_group usage.
"More more" no more!
Indentation issue
Export ARN in SQS queue and SNS topic / subscription; updated tests for new AWS SDK errors; updated documentation.
Changed Required: false to Optional: true in the SNS topic schema
Initial SNS support
correct resource name in example
added attributes reference section for AWS_EBS_VOLUME
...
2015-05-28 10:13:58 -05:00
Clint Shryock
9329073dae
refactor to poll for status consistently
2015-05-28 10:13:46 -05:00
_jac
a09afbb4aa
add project support https://github.com/xanzy/go-cloudstack/pull/21/files
2015-05-27 18:33:57 -07:00
Sander van Harmelen
a2aeb9f79d
Adding acceptance tests together with a few minor tweaks
2015-05-28 00:51:19 +02:00
Sander van Harmelen
8c3cb400d7
Updated to work with the latest Azure SDK changes
2015-05-28 00:51:19 +02:00
Sander van Harmelen
83e3ab1fc7
Seems to be almost ready...
2015-05-28 00:51:18 +02:00
Sander van Harmelen
1dbd32c6a7
Extending instance resource to enable using custom VM images
2015-05-28 00:51:18 +02:00
Sander van Harmelen
ca1eb1917b
Adding docs and tweaking the provider
2015-05-28 00:51:18 +02:00
Sander van Harmelen
123cd9239c
Updated to use forked azure-sdk-for-go package
2015-05-28 00:51:18 +02:00
Sander van Harmelen
d45f8ac52a
Small update after changes in the Azure SDK
2015-05-28 00:51:18 +02:00
Sander van Harmelen
f8a56ad3d7
Little refactoring and fixing some issues
...
Starting to look pretty nice…
2015-05-28 00:51:18 +02:00
Sander van Harmelen
4e33d898e9
Needs more testing and tests, but it's becoming a nice provider
2015-05-28 00:51:17 +02:00
Sander van Harmelen
84a870a255
First few azure resources...
...
Only the azure_instance is fully working (for both Linux and Windows
instances) now, but needs some tests. network and disk and pretty much
empty, but the idea is clear so will not take too much time…
2015-05-28 00:51:17 +02:00
Clint Shryock
3af25c1b97
refactor volume attachment to not retry attachment
2015-05-27 17:07:34 -05:00
Clint Shryock
c523401f46
provider/aws: Wait for EBS Volume to be available
2015-05-27 17:07:04 -05:00
Clint Shryock
d06f637c74
fix typo, use awslabs/aws-sdk-go
2015-05-27 16:07:38 -05:00
Clint Shryock
214ed23974
provider/aws: AWS Kinesis Stream support
...
Adds a Kinesis Stream resource
2015-05-27 15:54:17 -05:00
Clint
13e2a7cf0e
Merge pull request #2086 from hashicorp/f-aws-iam-server-cert
...
provider/aws: Add IAM Server Certificate resource
2015-05-27 08:34:23 -05:00
Chris Bednarski
1128c64ade
Merge pull request #2093 from sdboyer/master
...
nit: Condense switch fallthroughs into expression lists
2015-05-26 20:40:50 -07:00
Camilo Aguilar
c346da6981
providers/aws: Requires ttl and records attributes if there isn't an ALIAS block.
2015-05-26 22:11:01 -04:00
Sam Boyer
b82bd0c280
Condense switch fallthroughs into expr lists
2015-05-26 21:52:36 -04:00
Clint Shryock
be7ece0ce7
provider/aws: Add IAM Server Certificate resource
2015-05-26 16:40:15 -05:00
Michael Austin
9a8625e6a6
added new provider for creating objects in an s3 bucket
2015-05-26 10:46:06 -04:00
Adam Enger
6799225757
adding all supproted options for db snapshot restore
2015-05-24 20:18:36 -05:00
Adam Enger
b0d2b25b2d
Adding support for snapshot_identifier option which enables restoring a DB from a snapshot
2015-05-24 16:51:35 -05:00
John Ewart
17d9d314d0
Indentation issue
2015-05-22 21:19:43 -07:00
John Ewart
1dd95df5ab
Export ARN in SQS queue and SNS topic / subscription; updated tests for new AWS SDK errors; updated documentation.
2015-05-22 21:12:25 -07:00
John Ewart
0196a0c2ae
Changed Required: false to Optional: true in the SNS topic schema
2015-05-22 20:26:10 -07:00
John Ewart
68734517f8
Initial SNS support
2015-05-22 20:26:10 -07:00
Clint Shryock
fa44e455fa
provider/aws: Add accdeptance test for volume attachment
2015-05-22 17:02:05 -05:00
Clint Shryock
68587eb51e
provider/aws: Add resource_aws_volume_attachment
2015-05-22 16:30:40 -05:00
Clint
11f67ddc39
Merge pull request #2039 from stephenchu/master
...
Added support for 'comment' field for an AWS route53 zone resource.
2015-05-22 07:11:19 -05:00
Clint
b2af84f466
Merge pull request #2026 from hashicorp/f-aws-instance-move-tags
...
providers/aws: Move up where we assign tags on Instance
2015-05-22 06:48:04 -05:00
Clint
338bb50555
Merge pull request #2037 from hashicorp/f-aws-iam-instance-bug
...
provider/aws: Retry RunInstance if IAM profile hasn't propagated
2015-05-22 06:47:50 -05:00
Stephen Chu
5e2e2ffa20
Use Schema Default declaratively instead of defaulting at each payload creation.
2015-05-21 21:23:29 +00:00
Stephen Chu
c2628d8fae
Fixed some whitespacing issues.
2015-05-21 20:16:01 +00:00
Clint
ec06e81cf3
Merge pull request #1946 from hashicorp/f-aws-db-read-replicas
...
provider/aws: Add AWS RDS Read Replica
2015-05-21 15:14:11 -05:00
Paul Hinze
06eb388c3f
provider/template: store relative path in state
...
This makes template_file usage in modules portable.
2015-05-21 15:03:03 -05:00
Stephen Chu
69f4acd5ac
Moved 'comment' DSL definition to be alphabetically sorted.
2015-05-21 20:02:28 +00:00
Clint Shryock
a2baf1d755
provider/aws: Retry RunInstance if IAM profile hasn't propagated
2015-05-21 14:58:34 -05:00
Stephen Chu
cfbd546286
Added support for comment on a route53 zone.
2015-05-21 19:51:53 +00:00
Clint Shryock
6de8f9d180
provider/aws: RDS Read Replica cleanups
...
remove typos, debugging, and try spelling things correctly
2015-05-21 09:49:46 -05:00
Clint
e5f5e1a167
Merge pull request #2007 from iJoinSolutions/2544-terraform-s3-forceDelete
...
provider/aws: force_destroy argument for s3 buckets with objects
2015-05-21 09:43:23 -05:00
Clint Shryock
66372d8d1d
small update to keypair_refresh, to bring in-line with sdk changes
2015-05-21 09:21:57 -05:00
Phil Frost
9e2ecafc46
Handle AWS keypairs which no longer exist
...
When refreshing a keypair, update state appropriately rather than crash
if the keypair no longer exists on AWS.
Likely fixes #1851 .
2015-05-20 20:53:49 -04:00
Michael Austin
dc698e3b67
added force_destroy argument to s3 bucket provider
...
commit a92fe29b909af033c4c57257ddcb6793bfb694aa
Author: Michael Austin <m_austin@me.com>
Date: Wed May 20 16:35:38 2015 -0400
updated to new style of awserr
commit 428271c9b9ca01ed2add1ffa608ab354f520bfa0
Merge: b3bae0e 883e284
Author: Michael Austin <m_austin@me.com>
Date: Wed May 20 16:29:00 2015 -0400
Merge branch 'master' into 2544-terraform-s3-forceDelete
commit b3bae0efdac81adf8bb448d11cc1ca62eae75d94
Author: Michael Austin <m_austin@me.com>
Date: Wed May 20 12:06:36 2015 -0400
removed extra line
commit 85eb40fc7ce24f5eb01af10eadde35ebac3c8223
Author: Michael Austin <m_austin@me.com>
Date: Tue May 19 14:27:19 2015 -0400
stray [
commit d8a405f7d6880c350ab9fccb70b833d2239d9915
Author: Michael Austin <m_austin@me.com>
Date: Tue May 19 14:24:01 2015 -0400
addressed feedback concerning parsing of aws error in a more standard way
commit 5b9a5ee613af78e466d89ba772959bb38566f50e
Author: Michael Austin <m_austin@me.com>
Date: Tue May 19 10:55:22 2015 -0400
clarify comment to highlight recursion
commit 91043781f4ba08b075673cd4c7c01792975c2402
Author: Michael Austin <m_austin@me.com>
Date: Tue May 19 10:51:13 2015 -0400
addressed feedback about reusing err variable and unneeded parens
commit 95e9c3afbd34d4d09a6355b0aaeb52606917b6dc
Merge: 2637edf db095e2
Author: Michael Austin <m_austin@me.com>
Date: Mon May 18 19:15:36 2015 -0400
Merge branch 'master' into 2544-terraform-s3-forceDelete
commit 2637edfc48a23b2951032b1e974d7097602c4715
Author: Michael Austin <m_austin@me.com>
Date: Fri May 15 15:12:41 2015 -0400
optimize delete to delete up to 1000 at once instead of one at a time
commit 1441eb2ccf13fa34f4d8c43257c2e471108738e4
Author: Michael Austin <m_austin@me.com>
Date: Fri May 15 12:34:53 2015 -0400
Revert "hook new resource provider into configuration"
This reverts commit e14a1ade5315e3276e039b745a40ce69a64518b5.
commit b532fa22022e34e4a8ea09024874bb0e8265f3ac
Author: Michael Austin <m_austin@me.com>
Date: Fri May 15 12:34:49 2015 -0400
this file should not be in this branch
commit 645c0b66c6f000a6da50ebeca1d867a63e5fd9f1
Author: Michael Austin <m_austin@me.com>
Date: Thu May 14 21:15:29 2015 -0400
buckets tagged force_destroy will delete all files and then delete buckets
commit ac50cae214ce88e22bb1184386c56b8ba8c057f7
Author: Michael Austin <m_austin@me.com>
Date: Thu May 14 12:41:40 2015 -0400
added code to delete policy from s3 bucket
commit cd45e45d6d04a3956fe35c178d5e816ba18d1051
Author: Michael Austin <m_austin@me.com>
Date: Thu May 14 12:27:13 2015 -0400
added code to read bucket policy from bucket, however, it's not working as expected currently
commit 0d3d51abfddec9c39c60d8f7b81e8fcd88e117b9
Merge: 31ffdea 8a3b75d
Author: Michael Austin <m_austin@me.com>
Date: Thu May 14 08:38:06 2015 -0400
Merge remote-tracking branch 'hashi_origin/master' into 2544-terraform-s3-policy
commit 31ffdea96ba3d5ddf5d42f862e68c1c133e49925
Author: Michael Austin <m_austin@me.com>
Date: Wed May 13 16:01:52 2015 -0400
add name for use with resouce id
commit b41c7375dbd9ae43ee0d421cf2432c1eb174b5b0
Author: Michael Austin <m_austin@me.com>
Date: Wed May 13 14:48:24 2015 -0400
Revert "working policy assignment"
This reverts commit 0975a70c37eaa310d2bdfe6f77009253c5e450c7.
commit b926b11521878f1527bdcaba3c1b7c0b973e89e5
Author: Michael Austin <m_austin@me.com>
Date: Wed May 13 14:35:02 2015 -0400
moved policy to it's own provider
commit 233a5f443c13d71f3ddc06cf034d07cb8231b4dd
Merge: e14a1ad c003e96
Author: Michael Austin <m_austin@me.com>
Date: Wed May 13 12:39:14 2015 -0400
merged origin/master
commit e14a1ade5315e3276e039b745a40ce69a64518b5
Author: Michael Austin <m_austin@me.com>
Date: Wed May 13 12:26:51 2015 -0400
hook new resource provider into configuration
commit 455b409cb853faae3e45a0a3d4e2859ffc4ed865
Author: Michael Austin <m_austin@me.com>
Date: Wed May 13 12:26:15 2015 -0400
dummy resource provider
commit 0975a70c37eaa310d2bdfe6f77009253c5e450c7
Author: Michael Austin <m_austin@me.com>
Date: Wed May 13 09:42:31 2015 -0400
working policy assignment
commit 3ab901d6b3ab605adc0a8cb703aa047a513b68d4
Author: Michael Austin <m_austin@me.com>
Date: Tue May 12 10:39:56 2015 -0400
added policy string to schema
2015-05-20 19:06:27 -04:00
Clint Shryock
12e69084ef
providers/aws: Move up where we assign tags on Instance
2015-05-20 15:33:01 -05:00
Clint Shryock
6b6aa867c0
update read replica acceptance test
2015-05-20 09:28:33 -05:00
Clint Shryock
dc164c454e
remove default here
2015-05-20 08:26:05 -05:00
Clint Shryock
f346187948
provider/aws: Add RDS Read Replica support
2015-05-20 08:25:38 -05:00
Paul Hinze
31258e06c6
provider/aws: fix breakages from awserr refactor
...
This landed in aws-sdk-go yesterday, breaking the AWS provider in many places:
3c259c9586
Here, with much sedding, grepping, and manual massaging, we attempt to
catch Terraform up to the new `awserr.Error` interface world.
2015-05-20 06:21:23 -05:00
Alexander Dupuy
739a411b4d
debug security group ids
2015-05-18 23:02:19 +02:00
Clint Shryock
f6bcc302d3
providers/aws+cloudflare+dnsimple: Increase some verbosity
2015-05-18 15:25:03 -05:00
Justin Campbell
89f0def721
providers/aws: Normalize S3 bucket policy
...
AWS always returns a compressed JSON body, without spaces or newlines, so we round-trip the JSON before storing in the state.
2015-05-18 13:10:44 -04:00
Justin Campbell
4b17554993
providers/aws: test S3 policy unmarshaled JSON
2015-05-18 13:10:44 -04:00
Justin Campbell
9c764a3253
providers/aws: Add support for policy on S3 bucket
2015-05-18 13:10:44 -04:00
Dave Cunningham
419b4f02d2
Merge autoscaler & instance group PR from dwatson
...
Additionally:
Update CHANGELOG
Make cooldown period optional for autoscaler
Refactor autoscaler and add more error checking
Instance template now supports image aliases
Replace instance group manager 'size' -- use target_size (now writeable)
Add documentation for autoscaler
Add beta warnings to docs
2015-05-16 20:14:38 -04:00
Clint
9f52192a79
Merge pull request #1939 from johnewart/sqs
...
Initial SQS support
2015-05-15 15:44:52 -05:00
John Ewart
d538194f59
Added docs, tests, and updated SQS code
2015-05-15 13:09:20 -07:00
Clint Shryock
af09f257c8
fix regression in networkacl with conflicts with
2015-05-15 14:38:06 -05:00
Paul Hinze
e1ea427649
provider/aws: support ec2 termination protection
...
closes #1233
2015-05-15 15:20:58 -04:00
John Ewart
8dd479dbe0
Initial SQS support
2015-05-15 11:37:07 -07:00
Clint Shryock
0021906bda
fix minor regression with subnet_id
2015-05-15 10:58:59 -05:00
Clint Shryock
5113761f41
Merge branch 'f-aws-network-subnet-ids'
...
* f-aws-network-subnet-ids:
document Network ACL Subnet IDs attribute
provider/aws: Add tests for Network ACL subnets
upgrade to use typeset for subnet_ids
network acl cleanups
provider/aws: Support multiple subnets in Network ACL
2015-05-15 09:58:57 -05:00
Justin Campbell
e68dd5a8bf
Merge pull request #1909 from justincampbell/s3-redirect
...
providers/aws: Add support for S3 website redirect
2015-05-15 09:32:39 -04:00
Clint Shryock
d9521efbf6
provider/aws: Add tests for Network ACL subnets
2015-05-14 20:57:07 -05:00
Clint Shryock
468de49265
upgrade to use typeset for subnet_ids
2015-05-14 17:09:50 -05:00
John Engelman
bd6ff34aa2
Retrieve nameservers for private hosted zone.
2015-05-14 16:04:37 -05:00
John Engelman
a6fdb04829
Only d.Set("vpc_region") when creating a private zone.
2015-05-14 16:04:37 -05:00
John Engelman
3275ab0ba1
update acceptance test function names
2015-05-14 16:04:37 -05:00
John Engelman
b784908491
Add documentation and changelog for route53_zone_association
2015-05-14 16:04:36 -05:00
John Engelman
766aead4a5
Add tests for cross region VPC associations.
2015-05-14 16:03:51 -05:00
John Engelman
3507c0618b
cleanup of zone_association resource
2015-05-14 16:03:51 -05:00
Panagiotis Moustafellos
9da89974fc
fix vpc_region param check
2015-05-14 16:03:51 -05:00
Panagiotis Moustafellos
d02e247fc7
renamed region to vpc_region for clarity and made optional, updated tests
2015-05-14 16:03:51 -05:00
Panagiotis Moustafellos
450c42f166
keep clean changeinfo as res id
2015-05-14 16:03:51 -05:00
Panagiotis Moustafellos
9c8748d2dc
providers/aws: resource aws_route53_zone_association
2015-05-14 16:03:51 -05:00
John Engelman
052ff83670
Handle public zones correctly. Check for associate when reading.
2015-05-14 16:03:51 -05:00
John Engelman
8e62a14f29
verify VPC association on private zone
2015-05-14 16:03:50 -05:00
John Engelman
a51bc6007d
DelegationSet is not support in private zones.
2015-05-14 16:03:50 -05:00
John Engelman
bf97d6a80f
AWS/Route53Zone - create private hosted zone associated with VPC.
2015-05-14 16:03:50 -05:00
Paul Hinze
e47987651e
Merge pull request #1970 from hashicorp/f-asg-wait-for-elb-inservice
...
provider/aws: ASGs can wait for ELB InService
2015-05-14 15:09:45 -05:00
Paul Hinze
b56a42627f
provider/aws: ASGs can wait for ELB InService
...
This enhances the waiting strategy introduced in #1839 to wait for each
ASG instance to become InService in attached ELBs before continuing.
2015-05-14 15:03:53 -05:00
Clint
0b548a4a99
Merge pull request #1965 from hashicorp/f-export-cache-cluster-endpoints
...
provider/aws: export elasticache nodes
2015-05-14 14:05:33 -05:00
Clint Shryock
d81e63cc3c
provider/aws: ElastiCache test updates
...
- rename test to have _basic suffix, so we can run it individually
- use us-east-1 for basic test, since that's probably the only region that has
Classic
- update the indexing of nodes; cache nodes are 4 digits
2015-05-14 13:57:01 -05:00
Clint Shryock
10fc184c97
add tags helper library for ElastiCache
2015-05-14 12:32:40 -05:00
Mitchell Hashimoto
32f6eb77f3
Merge pull request #1960 from hashicorp/b-lc-ami
...
provider/aws: bad AMI won't block LC refresh [GH-1901]
2015-05-14 09:58:58 -07:00
Clint Shryock
2809280e98
cleanup
2015-05-14 11:51:08 -05:00
Clint Shryock
d8f3783d09
provider/aws: Add tag support to ElastiCache
2015-05-14 11:44:24 -05:00
Clint Shryock
aad0808cc5
make parameter group optional
2015-05-14 11:12:07 -05:00
Clint Shryock
a552db0c8c
provider/aws: ElastiCache enhancements
...
- request cache node info
- read after create, to populate nodes
2015-05-14 11:10:21 -05:00
Paul Hinze
7d9ee79660
provider/aws: add license_model to db_instance
2015-05-14 09:57:51 -05:00
Paul Hinze
6f3ce6bf3c
WIP export cache nodes
...
Needs to wait for len(cluster.CacheNodes) == cluster.NumCacheNodes, since
apparently that takes a bit of time and the initial response always has
an empty collection of nodes
2015-05-14 09:16:39 -05:00
Mitchell Hashimoto
e7c6cb22c5
provider/aws: bad AMI won't block LC refresh [GH-1901]
2015-05-13 20:28:36 -07:00
Joe Topjian
4daaacd292
Minor volume fixes
...
This commit follows suit of #1897 by fixing volume-related
parameters which allow the volume attach acceptance test
to work. It also re-enables the volume attach test.
2015-05-14 02:59:21 +00:00
Clint Shryock
898fa91595
network acl cleanups
2015-05-12 22:23:55 -05:00
Sander van Harmelen
4e0aa334fa
Merge pull request #1868 from svanharmelen/f-chef-client-provisioner
...
New provisioner for Chef-Client
2015-05-12 23:06:09 +02:00
Clint Shryock
f7b6b6b2b5
Strip 'sdk' suffix from methods; it's a remnant
2015-05-12 14:58:10 -05:00
Dave Cunningham
372908cc6f
Merge pull request #980 from BashtonLtd/gce_instance_template_network_update
...
Update Instance Template network definition to match changes to Instance.
2015-05-12 15:46:04 -04:00
Clint Shryock
0dda704cbf
provider/aws: Support multiple subnets in Network ACL
2015-05-12 13:50:28 -05:00
Dave Cunningham
e27393af41
Merge pull request #1894 from dcarley/gce_health_check_defaults
...
provider/gce: Fix updates for http_health_check (set defaults)
2015-05-12 12:29:40 -04:00
Justin Campbell
b8cd6b2bae
providers/aws: Add support for S3 website redirect
2015-05-12 11:24:08 -04:00
Sander van Harmelen
11314a3d71
Tweaking a few minor things according to the feedback on GH
2015-05-12 10:37:38 +02:00
Radek Simko
931d05198c
Merge pull request #1886 from TimeIncOSS/subnet-timeout-fix
...
Increase subnet & security group deletion timeout (2 -> 5 mins)
2015-05-12 07:02:28 +01:00
Dave Cunningham
5f15a9d26a
Allow local SSDs, Fix #1088
2015-05-11 21:40:37 -04:00
Joe Topjian
7ca7eeabe7
Added scheduler_hints to the OpenStack instance resource.
...
This allows various hints to be passed to the OpenStack scheduler
that will determine where the instance will be hosted in the cloud.
2015-05-12 01:08:20 +00:00
Joe Topjian
b74e74fc16
ServerGroup Resource
...
This commit adds a server group resource. Users can create server
groups with different policies. If a server is launched in a certain
group, the server will adhere to that policy. For example, servers
can be made to all launch on the same compute node or different compute
nodes.
2015-05-12 01:08:19 +00:00
Mitchell Hashimoto
e1627883b2
Merge pull request #1907 from PeopleNet/rds-update
...
provider/aws: Closes #1906 . Only submit modification requests if there is a change
2015-05-11 16:38:02 -07:00
Mitchell Hashimoto
c9b483d92a
Merge pull request #1910 from PeopleNet/rds-tags
...
Closes #1908 . Parse AccountId from User ARN for RDS tags
2015-05-11 16:37:10 -07:00
Mitchell Hashimoto
cc28d04777
Merge pull request #1911 from hashicorp/b-template-diffs
...
provider/template: don't diff when there's no diff
2015-05-11 16:34:09 -07:00
John Engelman
1798df8e03
Closes #1906 . Only submit modification requests if there is a change
2015-05-11 11:49:43 -05:00
Paul Hinze
a96a3372c6
provider/template: don't diff when there's no diff
...
This reworks the template lifecycle a bit such that we get nicer diff
behavior.
First, we tick ForceNew on for both filename and vars, so that the diff
indicates that the template will be "replaced" on change. This is mostly
cosmetic, but it also tracks conceptually with the fact that the
identifier we use is a hash of the contents, so any change essentially
makes a "new resource".
Second, we change the Exists implementation to only return `false` when
there has been a change in the rendered template. This lets descendent
resources see the computed value changing so that they'll properly
trigger in the plan.
Fixes #1898
Refs #1866 (but does not fix, there's another deeper issue there)
2015-05-11 10:38:19 -05:00
Paul Hinze
2783521960
Merge pull request #1897 from jtopjian/openstack-acctest-fixes
...
provider/openstack: Acceptance Test Fixes
2015-05-11 10:35:24 -05:00
John Engelman
04214c8c1a
Closes #1908 . Parse AccountId from User ARN for RDS tags
2015-05-11 10:32:06 -05:00
Sander van Harmelen
a8dacede24
Improved some logging...
...
I added a debug log line in the last commit, only to find out it’s now
logging the same info twice. So removed the double entry and tweaked
the existing once.
2015-05-11 15:18:32 +02:00
Joe Topjian
9c27194ee1
gofmt fixes
2015-05-11 00:58:16 +00:00
Dan Carley
579c37cd74
provider/gce: Set defaults for http_health_check
...
In order to fix the failing test in the preceding commit when optional
params are changed from their default "computed" values.
These weren't working well with `HttpHealthCheck.Patch()` because it was
attempting to set all unspecified params to Go's type defaults (eg. 0 for
int64) which the API rejected.
Changing the call to `HttpHealthCheck.Update()` seemed to fix this but it
still didn't allow you to reset a param back to it's default by no longer
specifying it.
Settings defaults like this, which match the Terraform docs, seems like the
best all round solution. Includes two additional tests for the acceptance
tests which verify the params are really getting set correctly.
2015-05-10 21:20:40 +01:00
Dan Carley
13e9e6f51d
provider/gce: Test updates to http_health_check
...
By first creating a very simple resource that mostly uses the default
values and then changing the two thresholds from their computed defaults.
This currently fails with the following error and will be fixed in a
subsequent commit:
--- FAIL: TestAccComputeHttpHealthCheck_update (5.58s)
testing.go:131: Step 1 error: Error applying: 1 error(s) occurred:
* 1 error(s) occurred:
* 1 error(s) occurred:
* Error patching HttpHealthCheck: googleapi: Error 400: Invalid value for field 'resource.port': '0'. Must be greater than or equal to 1
More details:
Reason: invalid, Message: Invalid value for field 'resource.port': '0'. Must be greater than or equal to 1
Reason: invalid, Message: Invalid value for field 'resource.checkIntervalSec': '0'. Must be greater than or equal to 1
Reason: invalid, Message: Invalid value for field 'resource.timeoutSec': '0'. Must be greater than or equal to 1
2015-05-10 21:20:32 +01:00
Dan Carley
88f4df28ac
provider/gce: Fix whitespace in test fixture
...
Mixture of hard and soft tabs, which isn't picked up by `go fmt` because
it's inside a string. Standardise on hard-tabs since that is what's used
in the rest of the code.
2015-05-10 21:06:33 +01:00
Joe Topjian
fe668a1ac7
Fixing TestAccFWPolicyV1
2015-05-10 04:39:00 +00:00
Joe Topjian
a6b9a63231
Fixing TestAccFWFirewallV1
2015-05-10 04:38:36 +00:00
Joe Topjian
4811112a6a
Fixing TestAccNetworkingV2Subnet_basic
2015-05-10 04:38:06 +00:00
Joe Topjian
feb5a3c6bb
Fixing TestAccNetworkingV2RouterInterface_basic
2015-05-09 23:04:45 +00:00
Joe Topjian
1e7a227ea6
Fixing TestAccNetworkingV2FloatingIP_basic
2015-05-09 22:58:25 +00:00
Joe Topjian
5535a9ba32
Fixing TestAccLBV1Pool_basic
2015-05-09 22:43:40 +00:00
Joe Topjian
de74f3e586
Fixing TestAccLBV1Monitor_basic
2015-05-09 22:26:23 +00:00
Radek Simko
754bcd8307
Increase subnet & security group deletion timeout (2 -> 5 mins)
...
- this should prevent DependencyViolation errors while waiting for larger ASGs to shut down
2015-05-09 22:18:04 +01:00
Joe Topjian
2d512343a0
Fixing TestAccBlockStorageV1Volume_basic
2015-05-09 20:31:34 +00:00
Joe Topjian
04d694fe53
Disabling volume attach test for now
2015-05-09 17:07:50 +00:00
Sander van Harmelen
2a5fffc24d
Small textual update...
2015-05-08 23:27:12 +02:00
Sander van Harmelen
c19d92fb67
Refactored quite a few things after review...
...
Also renamed the provisioner to just `chef` as it’s out intention to
end up with one provisioner for all types of `chef` clients.
2015-05-08 23:25:24 +02:00
Clint Shryock
eaf96d9d6f
provider/aws: Document AWS ElastiCache cluster
...
- ElastiCache subnet group name is computed
2015-05-08 14:33:41 -05:00
Radek Simko
ce8351ddef
provider/aws: Add FQDN as output to route53_record
2015-05-08 20:19:40 +01:00
Justin Campbell
870b48b1c0
Merge pull request #1865 from justincampbell/s3-region-zone
...
providers/aws: Add hosted_zone_id and region to attributes
2015-05-08 14:49:12 -04:00
Paul Hinze
a28267b886
provider/aws: SG description should be ForceNew
...
Description cannot be handled in Update (there is no ModifySecurityGroup
API call), so we have to recreate to change the description.
Closes #1870
2015-05-08 12:16:54 -05:00
Sander van Harmelen
d4150d5b1a
Adding the tests...
2015-05-08 18:17:57 +02:00
Justin Campbell
73651e2c70
providers/aws: Extract normalizeRegion
2015-05-08 10:49:21 -04:00
Justin Campbell
445f92e48a
providers/aws: Move HostedZoneIDForRegion into TF
2015-05-08 10:49:20 -04:00
Justin Campbell
64d2b495c3
providers/aws: Add region to S3 attrs
2015-05-08 10:02:16 -04:00
Justin Campbell
839688d477
providers/aws: Add hosted_zone_id to S3 attrs
2015-05-08 10:02:16 -04:00
Justin Campbell
d7c9d8702c
providers/aws: Extract website endpoint logic
2015-05-08 10:02:16 -04:00
Sander van Harmelen
4a99cf9e9f
Small update/fix to properly clean ANSI going to the logfile...
2015-05-08 14:54:56 +02:00
Sander van Harmelen
60984b2da2
This commit adds a Chef Client provisioner
...
The commit is pretty complete and has a tested/working provisioner for
both SSH and WinRM. There are a few tests, but we maybe need another
few to have better coverage. Docs are also included…
2015-05-08 14:54:56 +02:00
Felix Rodriguez
60c3ca0430
typo
2015-05-07 23:21:47 +01:00
Clint Shryock
44461f49fd
update structure test
2015-05-07 17:18:47 -05:00
Clint Shryock
70984526a4
Merge remote-tracking branch 'ctiwald/ct/fix-protocol-problem'
...
* ctiwald/ct/fix-protocol-problem:
aws: Document the odd protocol = "-1" behavior in security groups.
aws: Fixup structure_test to handle new expandIPPerms behavior.
aws: Add security group acceptance tests for protocol -1 fixes.
aws: error on expndIPPerms(...) if our ports and protocol conflict.
2015-05-07 17:13:21 -05:00
Clint
4874179e9a
Merge pull request #1843 from ctiwald/ct/fix-network-acls
...
Fix a number of issues in AWS network ACLs
2015-05-07 16:39:10 -05:00
Mitchell Hashimoto
ddad945717
provider/terraform: test fixture
2015-05-07 09:59:23 -07:00
Paul Hinze
1594cb3dbe
provider/aws: remove names from LCs in ASG tests
...
Makes the tests a little more durable if your account happens to end up
with a dangling LC.
2015-05-07 10:14:49 -05:00
Clint Shryock
20ebb38b8f
update s3bucket website tests
2015-05-07 10:13:08 -05:00
Clint
ef62385a95
Merge pull request #1849 from hashicorp/f-aws-update-s3-website-tests
...
update tests so go vet is happy
2015-05-07 10:06:43 -05:00
Clint Shryock
fed42fe1b3
update tests so go vet is happy
2015-05-07 10:03:28 -05:00
Paul Hinze
44e448b8c9
provider/docker: update image sha
...
Should eventually see if there's a way to rework this so it's less
brittle. But for now, we band-aid!
2015-05-07 09:50:16 -05:00
Paul Hinze
28875f49cd
provider/heroku: fix config_vars in addons
...
These were never read properly - on Addons they show up as just a list
of var names, not a Map.
Fixes one issue in Addon acceptance tests.
2015-05-07 09:11:31 -05:00
Paul Hinze
e7b101dba4
provider/aws: elasticache_cluster engine_version is computed
...
fixes the TestAccAWSElasticacheCluster test
2015-05-07 08:47:52 -05:00
Christopher Tiwald
9e8aefcd40
aws: Fix network ACL acceptance tests and add -1 protocol rule.
2015-05-06 23:54:14 -04:00
Christopher Tiwald
5b0d61727e
aws: Only store protocol numbers for ingress/egress rules on ACLs.
...
Users can input a limited number of protocol names (e.g. "tcp") as
inputs to network ACL rules, but the API only supports valid protocol
number:
http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
Preserve the convenience of protocol names and simultaneously support
numbers by only writing numbers to the state file. Also use numbers
when hashing the rules, to keep everything consistent.
2015-05-06 23:54:12 -04:00
Christopher Tiwald
8056b5f8f7
aws: Force users to use valid network masks on ACL ingress/egress
...
AWS will accept any overly-specific IP/mask combination, such as
10.1.2.2/24, but will store it by its implied network: 10.1.2.0/24.
This results in hashing errors, because the remote API will return
hashing results out of sync with the local configuration file.
Enforce a stricter API rule than AWS. Force users to use valid masks,
and run a quick calculation on their input to discover their intent.
2015-05-06 23:53:34 -04:00
Christopher Tiwald
b888b31e08
aws: Force users to use from_port, to_port = 0 on network ACLs with -1 protocol
...
AWS doesn't store ports for -1 protocol rules, thus the read from the
API will always come up with a different hash. Force the user to make a
deliberate port choice when enabling -1 protocol rules. All from_port
and to_port's on these rules must be 0.
2015-05-06 23:51:23 -04:00
Christopher Tiwald
d14049c8ad
aws: Don't try to modify or delete the untouchable network_acl rules.
...
AWS includes default rules with all network ACL resources which cannot
be modified by the user. Don't attempt to store them locally or change
them remotely if they are already stored -- it'll consistently result
in hashing problems.
2015-05-06 23:03:25 -04:00
Christopher Tiwald
03ee059da3
aws: Write ingress/egress rules into a map so they can be set.
...
resourceAwsNetworkAclRead swallowed these errors resulting in rules
that never properly updated. Implement an entry-to-maplist function
that'll allow us to write something that Set knows how to read.
2015-05-06 23:03:24 -04:00
Josh Bleecher Snyder
ed67f8f588
providers/aws: detect credentials more robustly
...
aws hides its credentials in many places:
multiple env vars, config files,
ec2 metadata.
Terraform currently recognizes only the env vars;
to use the other options, you had to put in a
dummy empty value for access_key and secret_key.
Rather than duplicate all aws checks, ask the
aws sdk to fetch credentials earlier.
2015-05-06 20:02:09 -07:00
Paul Hinze
a9678bd252
Merge pull request #1840 from hashicorp/f-aws-asg-handle-scaling-activity-in-progress-errors
...
provider/aws: handle in progress errs from ASG deletes
2015-05-06 19:39:23 -05:00
Paul Hinze
90907c8be5
Merge pull request #1738 from justincampbell/s3-website
...
providers/aws: S3 bucket website support
2015-05-06 19:37:29 -05:00
Paul Hinze
9a286402c3
Merge pull request #1838 from josharian/consul-scheme
...
providers/consul: add scheme argument
2015-05-06 19:09:11 -05:00
Paul Hinze
03530d1285
provider/aws: handle in progress errs from ASG deletes
...
If an AutoScalingGroup is in the middle of performing a Scaling
Activity, it cannot be deleted, and yields a ScalingActivityInProgress
error.
Retry the delete for up to 5m so we don't choke on this error. It's
telling us something's in progress, so we'll keep trying until the
scaling activity completed.
2015-05-06 18:54:59 -05:00
Paul Hinze
761523e8f9
Merge pull request #1839 from hashicorp/f-aws-asg-wait-for-capacity
...
provider/aws: wait for ASG capacity on creation
2015-05-06 18:40:13 -05:00
Paul Hinze
063454e9b8
provider/aws: wait for ASG capacity on creation
...
On ASG creation, waits for up to 10m for desired_capacity or min_size
healthy nodes to show up in the group before continuing.
With CBD and proper HealthCheck tuning, this allows us guarantee safe
ASG replacement.
2015-05-06 18:34:20 -05:00
Josh Bleecher Snyder
30d34908b7
providers/consul: add scheme argument
...
This enables connecting to consul over https
without having to set the envvar CONSUL_HTTP_SSL.
2015-05-06 16:12:32 -07:00
Clint
c44ba73a2a
Merge pull request #1837 from hashicorp/b-fix-aws-sg-vpcid
...
provider/aws: fix issue with reading VPC id in AWS Security Group
2015-05-06 17:01:20 -05:00
Clint Shryock
8705f0f78f
provider/aws: fix issue with reading VPC id in AWS Security Group
2015-05-06 16:54:43 -05:00
Mitchell Hashimoto
4a61d0abc9
provider/aws: do connection draining stuff totally separate
2015-05-06 11:47:06 -07:00
Clint Shryock
acbca8101c
provider/aws: Update Elasticache Subnet test
2015-05-06 13:44:24 -05:00
Mitchell Hashimoto
5378d904a2
provider/aws: remove debug
2015-05-06 11:43:36 -07:00
Mitchell Hashimoto
74665f27c8
provider/aws: must set connection draining timeout separate frrom
...
enabled
2015-05-06 11:43:18 -07:00
Paul Hinze
300bc129a1
Merge pull request #1832 from hashicorp/b-google-instance-template-metadata
...
provider/google: compute template metadata to map
2015-05-06 13:18:38 -05:00
Mitchell Hashimoto
5d12c79d90
provider/aws: retry VGW connection a bit due to eventual consistency
2015-05-06 11:09:51 -07:00
Paul Hinze
75c8396f7a
provider/google: compute template metadata to map
...
Needs to match instance, since shared processing helper functions are
used.
Closes #1665
2015-05-06 12:33:35 -05:00
Mitchell Hashimoto
f2ddb53c8f
provider/aws: only include network in hash if instance is not set
2015-05-06 10:32:17 -07:00
Mitchell Hashimoto
7311019efe
provider/aws: fix incorrect test
2015-05-06 10:20:19 -07:00
Mitchell Hashimoto
4db68cee89
providers/aws: eip network interface is computed
2015-05-06 10:04:38 -07:00
Mitchell Hashimoto
37c56d0084
provider/aws: fix alias test
2015-05-06 09:55:14 -07:00
Clint Shryock
4e717829f8
Merge branch 'master' of github.com:hashicorp/terraform
...
* 'master' of github.com:hashicorp/terraform:
provider/aws: detach VPN gateway with proper ID
update CHANGELOG
provider/aws: Update ARN in instanceProfileReadResult
provider/aws: remove placement_group from acctest
core: module targeting
Added support for more complexly images repos such as images on a private registry that are stored as namespace/name
2015-05-06 11:45:35 -05:00
Mitchell Hashimoto
b184e283b9
provider/aws: detach VPN gateway with proper ID
2015-05-06 09:45:08 -07:00
Clint Shryock
cd90648d4e
provider/aws: Fix acceptance issue with Network Acls
2015-05-06 11:44:09 -05:00
Mitchell Hashimoto
d8485ef506
Merge pull request #1818 from jwthomp/feature/image_name_parse
...
providers/docker: Support for more complexly named image repos
2015-05-06 09:02:41 -07:00
TANABE Ken-ichi
5be4ecdcdb
provider/aws: Update ARN in instanceProfileReadResult
2015-05-07 00:26:57 +09:00
Paul Hinze
010a39a58e
provider/aws: remove placement_group from acctest
...
Depends on there being an existing placement group in the account called
"terraform-placement-group" - we'll need to circle back around to cover
this with AccTests after TF gets an `aws_placement_group` resource.
2015-05-06 10:13:24 -05:00
Clint Shryock
34609c6c22
provider/aws: Change Route 53 record test name, so it can be ran individually
2015-05-06 09:48:15 -05:00
Paul Hinze
66fa633b80
provider/aws: move EBS test into us-west-2
2015-05-06 09:22:34 -05:00
Paul Hinze
bcb4067cb3
provider/aws: update test name
2015-05-06 09:20:40 -05:00
Paul Hinze
7303568469
providers/aws: update test name
2015-05-06 09:18:41 -05:00
Paul Hinze
b91796368f
provider/aws: update test name
2015-05-06 09:18:00 -05:00
Justin Campbell
2745adba56
providers/aws: Test S3 website endpoint attr
2015-05-06 09:41:02 -04:00
Justin Campbell
87e6d3d17f
providers/aws: Fix S3 website error doc
2015-05-06 09:41:02 -04:00
Justin Campbell
0b78a71ed5
providers/aws: Test S3 website removal
2015-05-06 09:41:02 -04:00
Justin Campbell
eeb65b8d4c
providers/aws: Read S3 website config
2015-05-06 09:41:02 -04:00
Paul Hinze
6c6eafa232
provider/aws: removing stray "Ecache" in tests
2015-05-06 08:33:05 -05:00
Justin Campbell
20e531ae0d
providers/aws: Check that S3 website sets docs
2015-05-06 08:15:56 -04:00
Justin Campbell
be84cf8a8c
providers/aws: Add note for us-east-1 empty location
2015-05-06 08:15:56 -04:00
Justin Campbell
348942d3fb
providers/aws: Use GetOk instead of Get + cast
2015-05-06 08:15:56 -04:00
Justin Campbell
562bd6541b
providers/aws: Use explicit returns in websiteEndpoint
2015-05-06 08:15:56 -04:00
Justin Campbell
30f737c781
providers/aws: Change S3 website to block
2015-05-06 08:15:56 -04:00
Justin Campbell
38e04b3765
providers/aws: Add website_endpoint to S3 output
2015-05-06 08:15:55 -04:00
Justin Campbell
b7a9ef5ef6
providers/aws: Add S3 error_document
...
Also fix when index/error document is empty
2015-05-06 08:15:55 -04:00
Justin Campbell
e6d9dcfb1a
providers/aws: Initial S3 bucket website support
2015-05-06 08:15:55 -04:00
Joe Topjian
b54df9bc0b
Fixing TestAccComputeV2FloatingIP_attach
2015-05-06 05:58:58 +00:00
Joe Topjian
219c86ef93
Fixing TestAccComputeV2Instance_floatingIPAttach
2015-05-06 05:53:17 +00:00
Joe Topjian
e76dca9756
Fixing TestAccComputeV2Instance_basic
2015-05-06 05:50:21 +00:00
Paul Hinze
cebcee5c63
Merge pull request #1778 from josharian/template-provider
...
providers: add template provider
2015-05-05 20:09:27 -05:00
Mitchell Hashimoto
1a2bac7645
provider/aws: main route table refresh handles VPC being gone [GH-1806]
2015-05-05 18:07:22 -07:00
Jeff Thompson
8e53355ff3
Added support for more complexly images repos such as images on a private registry that are stored as namespace/name
2015-05-05 23:22:09 +00:00
Clint Shryock
885efa0837
provider/aws: Add Security Group Rule as a top level resource
...
- document conflict with sg rules and sg in-line rules
- for this to work, ingress rules need to be computed
2015-05-05 16:56:39 -05:00
Clint
a4000941c2
Merge pull request #1765 from hashicorp/f-aws-security-group-remove-default-egress
...
provider/aws: Remove default egress rule from Security Group on creation
2015-05-05 16:47:23 -05:00
Mitchell Hashimoto
fb4ac42c65
Merge pull request #1516 from henrikhodne/aws-propagating-vgws
...
provider/aws: add propagating_vgws to route tables
2015-05-05 14:42:45 -07:00
Clint Shryock
eb7c1bb218
fix go formatting
2015-05-05 16:42:08 -05:00
Clint Shryock
e9b08cf31f
revert the required part
2015-05-05 16:23:26 -05:00
Clint Shryock
1ed81da9a9
update ENI test for SG egress constraint
2015-05-05 16:23:26 -05:00
Clint Shryock
85b1756c27
revise tests and check for vpc_id
2015-05-05 16:23:26 -05:00
Clint Shryock
8ded3c2d1b
Move block for deleing default rule into the create method; only invoke once
2015-05-05 16:23:26 -05:00
Clint Shryock
ee65684abe
Add spec for removing default egress rule
2015-05-05 16:23:26 -05:00
Clint Shryock
b145ce88b7
Document Egress+VPC change, update link
2015-05-05 16:23:26 -05:00
Clint Shryock
1558fd1c3e
provider/aws: Remove default egress rule from Security Group on creation
2015-05-05 16:23:25 -05:00
Mitchell Hashimoto
412a2dca0b
Merge pull request #1575 from freshbooks/aws-eni-route
...
provider/aws: Add Elastic Network Interfaces as route destination
2015-05-05 13:28:48 -07:00
Mitchell Hashimoto
1c2d5fbd0a
Merge branch 'f-aws-associate-eip-to-eni' of https://github.com/jstremick/terraform into jstremick-f-aws-associate-eip-to-eni
2015-05-05 13:24:50 -07:00
Clint
18b43b78cb
Merge pull request #939 from bitglue/iam
...
Implement a subset of IAM resources
2015-05-05 15:05:05 -05:00
Clint Shryock
7b082d007e
Merge commit '33183c0'
...
* commit '33183c0':
Implement a hash function for string sets
2015-05-05 15:01:02 -05:00
Mitchell Hashimoto
7a5499d4f7
providers/aws: chain credentials
2015-05-05 10:44:19 -07:00
Mitchell Hashimoto
639f310ae6
Merge pull request #1805 from dupuy/openstack-resource-docs
...
Openstack resource docs
2015-05-05 10:25:30 -07:00
John Engelman
6ee17a8e9e
Add acceptance tests
2015-05-05 12:47:20 -04:00
Phil Frost
b082117e92
Implement AWS IAM resources
...
- Users
- Groups
- Roles
- Inline policies for the above three
- Instance profiles
- Managed policies
- Access keys
This is most of the data types provided by IAM. There are a few things
missing, but the functionality here is probably sufficient for 95% of
the cases. Makes a dent in #28 .
2015-05-05 12:47:20 -04:00
Phil Frost
33183c078b
Implement a hash function for string sets
...
Sets of strings are pretty common. Let's not duplicate the function
necessary to create a set of strings in so many places.
2015-05-05 12:47:18 -04:00
Clint Shryock
272415303d
provider/aws: Shorting retry timeout for Subnets to 2 minutes, from 5
2015-05-05 11:20:29 -05:00
Clint Shryock
3ce3b7c516
provider/aws: Shorting retry timeout for Security Groups to 2 minutes, from 5
2015-05-05 11:07:16 -05:00
Clint Shryock
4b160dd28e
minor cleanups
2015-05-05 10:45:30 -05:00
jba
c50bcf2930
renaming function according to the aws struct
2015-05-05 10:39:25 -05:00
jba
e9215c0676
move accept block to the update func
2015-05-05 10:38:20 -05:00
jba
5658fd6122
clean code
2015-05-05 10:37:13 -05:00
jba
11ba9b1042
add the auto_accecpt option
2015-05-05 10:37:13 -05:00
Alexander Dupuy
2ccaaf204d
fix copy/paste typo in OpenStack FW error messages
2015-05-05 14:01:49 +02:00
Sander van Harmelen
44541c5465
Fixing up some tests after a couple of thorough test rounds
2015-05-05 12:31:21 +02:00
Avi Nanhkoesingh
1411d4010f
Fixes #1 : sets the rights values based on isUUID
2015-05-05 12:31:21 +02:00
Sander van Harmelen
7274de3c1d
Small fix needed to be inline with the updated AWS SDK again...
...
Executed a couple of AWS ACC test as well to make sure everything works
properly again after this fix…
2015-05-05 12:26:26 +02:00
Christopher Tiwald
69e981c0b0
aws: Fixup structure_test to handle new expandIPPerms behavior.
2015-05-04 23:56:54 -04:00
Christopher Tiwald
362a6124e3
aws: Add security group acceptance tests for protocol -1 fixes.
...
These only test ingress rules as egress rules are broken by the
default "0.0.0.0/0" rule Amazon includes with every egressed security
group.
2015-05-04 23:55:32 -04:00
Christopher Tiwald
89bacc0b15
aws: error on expndIPPerms(...) if our ports and protocol conflict.
...
Ingress and egress rules given a "-1" protocol don't have ports when
Read out of AWS. This results in hashing problems, as a local
config file might contain port declarations AWS can't ever return.
Rather than making ports optional fields, which carries with it a huge
headache trying to distinguish between zero-value attributes (e.g.
'to_port = 0') and attributes that are simply omitted, simply force the
user to opt-in when using the "-1" protocol. If they choose to use it,
they must now specify "0" for both to_port and from_port. Any other
configuration will error.
2015-05-04 23:43:31 -04:00
Clint Shryock
81422123e8
provider/aws: Add a regression check for Route 53 records
2015-05-04 17:05:49 -05:00
Mitchell Hashimoto
9ed909c8fe
Merge pull request #1749 from nabeken/aws-proxy-protocol-policy
...
provider/aws: Add proxy protocol support in ELB
2015-05-04 14:04:53 -07:00
Mitchell Hashimoto
8633c88723
Merge pull request #1775 from TimeIncOSS/r53-alias-record
...
aws: Add support for Alias records into AWS Route 53
2015-05-04 14:03:29 -07:00
Mitchell Hashimoto
c8c0b02790
Merge pull request #1787 from koendc/f-aws-max-retries
...
aws: make MaxRetries for API calls configurable
2015-05-04 14:00:37 -07:00
Mitchell Hashimoto
2c90d3a637
Merge pull request #1793 from ctiwald/ct/add-vpn-connection-route
...
provider/aws: add support for VPN connection routes
2015-05-04 13:58:17 -07:00
Mitchell Hashimoto
9617761eb4
Merge pull request #1776 from TimeIncOSS/eip-without-igw
...
[bugfix] aws/eip: Don't save instance ID if association fails
2015-05-04 11:19:32 -07:00
Mitchell Hashimoto
cf6fa89f46
Merge pull request #1785 from koendc/f-aws-security-token
...
aws: re-introduce support for AWS_SECURITY_TOKEN
2015-05-04 11:18:28 -07:00
Josh Bleecher Snyder
76bcac3031
providers/template: add tests, address review comments
...
Do directory expansion on filenames.
Add basic acceptance tests. Code coverage is 72.5%.
Uncovered code is uninteresting and/or impossible error cases.
Note that this required adding a knob to
helper/resource.TestStep to allow transient
resources.
2015-05-04 10:26:17 -07:00
Christopher Tiwald
2c21f248ad
aws: Add acceptance tests for VPN connection routes.
2015-05-04 12:55:55 -04:00
Christopher Tiwald
e7f8883929
aws: Add support for VPN connection routes.
2015-05-04 12:20:42 -04:00
Christopher Tiwald
4727260987
aws: fix VPN connection acceptance test.
...
This corrects syntactical errors and uses distinct IP addresses for
each configuration.
2015-05-04 11:34:35 -04:00
Christopher Tiwald
47305c9c5d
aws: Fix customer gateway acceptance test.
...
This test contained a few syntactical errors.
2015-05-04 11:34:35 -04:00
Christopher Tiwald
f31466a60e
aws: Fix app cookie stickiness policy acceptance test.
...
This used the wrong AZ and contained a few syntactical errors in
configuration.
2015-05-04 11:34:35 -04:00
Christopher Tiwald
14ea3a33a4
aws: Fix LB cookie stickiness policy acceptance test.
...
This needs to run in us-west-2 and contained a few syntactical errors
that prevented it from working.
2015-05-04 11:34:34 -04:00
Jean Mertz
87cde8834e
OpenStack: add functionality to attach FloatingIP to Port
2015-05-03 16:00:00 +02:00
Koen De Causmaecker
398c22adcd
aws: make MaxRetries for API calls configurable
...
- Make it configurable in the AWS provider by add an option
'max_retries'.
- Set the default from 3 to 11 retries.
2015-05-03 15:35:51 +02:00
Koen De Causmaecker
c8f32a2711
aws: re-introduce support for AWS_SECURITY_TOKEN
2015-05-03 10:26:58 +02:00
Dave Cunningham
cc7f4edd27
Merge pull request #1764 from sparkprime/scopes-pr
...
Use a set for service account scopes. Fix #1759
2015-05-01 22:31:12 -04:00
Paul Hinze
fb37b3515d
Merge pull request #1712 from hashicorp/f-rename-elasticache-cluster
...
providers/aws: add _cluster to aws_elasticache
2015-05-01 20:07:19 -05:00
Paul Hinze
199dabaf75
Merge pull request #1772 from ctiwald/ct/add-vpn-connection
...
Add support for AWS VPN connections.
2015-05-01 19:39:10 -05:00
Josh Bleecher Snyder
745d83a995
providers: add template provider
...
Fixes #215 .
2015-05-01 16:59:49 -07:00
Radek Simko
795d53e706
[bugfix] Don't save instance ID if association fails
...
- typically happens when no internet GW is available in VPC
2015-05-01 23:55:08 +01:00
Radek Simko
3d665ddfcf
provider/aws: Add support for alias record to Route53
2015-05-01 22:43:04 +01:00
Sander van Harmelen
41748003c0
Updated the PR according to the review comments
...
* We now return an error when you set the script_path to
C:\Windows\Temp explaining this is currently not supported
* The fix in PR #1588 is converted to the updated setup in this PR
including the unit tests
Last thing to do is add a few tests for the WinRM communicator…
2015-05-01 18:52:01 +02:00
Sander van Harmelen
4a29c714e5
Adding support for WinRM
2015-05-01 18:48:54 +02:00
Sander van Harmelen
b1c6a3f63f
Few small fixes to make the last tests also pass
...
The reason why the shebang is removed from these tests, is because the
shebang is only needed for SSH/Linux connections. So in the new setup
the shebang line is added in the SSH communicator instead of in the
resource provisioner itself…
2015-05-01 18:48:54 +02:00
Sander van Harmelen
c9e9e374bb
Adding some abstractions for the communicators
...
This is needed as preperation for adding WinRM support. There is still
one error in the tests which needs another look, but other than that it
seems like were now ready to start working on the WinRM part…
2015-05-01 18:48:54 +02:00
Christopher Tiwald
f255fd8c42
aws: Add acceptance tests for aws_vpn_connection resources.
2015-05-01 12:23:16 -04:00
Christopher Tiwald
814403f45c
aws: Add support for AWS VPN connections
2015-05-01 12:23:08 -04:00
Radek Simko
bafabf17be
provider/aws: Expose zone_id from elb
2015-05-01 08:07:33 +01:00
Dave Cunningham
85cc4ec0c1
Use a set for service account scopes. Fix #1759
2015-04-30 21:21:21 -04:00
Camilo Aguilar
338ae601bc
providers/aws: Implements DHCP Options Set support.
2015-04-30 17:52:04 -04:00
Mitchell Hashimoto
aaf94e7cec
Merge pull request #1745 from hashicorp/b-openstack-bool
...
provider/openstack: enable_dhcp should be bool [GH-1741]
2015-04-30 14:27:14 -07:00
Paul Hinze
15b9bde1fe
providers/aws: add _cluster to aws_elasticache
...
This AWS calls the actual resources "Cache Clusters" so it seems like
this name makes more sense.
Verified all Elasticache acc tests pass.
2015-04-30 16:12:08 -05:00
Paul Hinze
a9de720a4e
Merge pull request #1708 from hashicorp/f-elb-source-security-group
...
providers/aws: add source_security_group to elb
2015-04-30 16:10:02 -05:00
Clint
76e897fedb
Merge pull request #1753 from hashicorp/f-aws-db-subnet-name
...
provider/aws: Fix refresh/plan issue with DB Param. Group name
2015-04-30 13:42:06 -05:00
Paul Hinze
b99611fa44
provider/aws: allow key_pair name to be generated
...
As a module author, I'd like to be able to create a module that includes
a key_pair. I don't care about the name, I only know I don't want it to
collide with anything else in the account.
This allows my module to be used multiple times in the same account
without having to do anything funky like adding a user-specified unique
name parameter.
2015-04-30 10:33:14 -05:00
Clint Shryock
c006af9efe
provider/aws: Fix refresh/plan issue with DB Param. Group name
...
Check against AWS with lowercase, but store in state unmodified.
2015-04-30 09:25:50 -05:00
TANABE Ken-ichi
53a7da379c
provider/aws: Add acceptance tests for aws_proxy_protocol_policy
2015-04-30 17:56:46 +09:00
TANABE Ken-ichi
9df2bf68cb
providers/aws: use isLoadBalancerNotFound
2015-04-30 17:56:46 +09:00
TANABE Ken-ichi
5c1dabdb69
provider/aws: Add ProxyProtocol support via aws_proxy_protocol_policy
2015-04-30 17:56:46 +09:00
Dave Cunningham
f6554fb4a9
Support Google Cloud DNS, Fix #1148
2015-04-30 01:32:34 -04:00
Christopher Tiwald
eb03f08454
aws: Add acceptance test for aws_customer_gateway.
2015-04-29 21:32:59 -04:00
Christopher Tiwald
2794a1c5ab
aws: Add support for aws_customer_gateway
2015-04-29 21:32:51 -04:00
Mitchell Hashimoto
136402afe9
Merge pull request #1726 from skfmu/f-openstack-add-availability-zones
...
provider/openstack: Add availability zones for OpenStack block storage
2015-04-29 17:38:19 -07:00
Mitchell Hashimoto
914740f065
provider/openstack: enable_dhcp should be bool [GH-1741]
2015-04-29 17:30:58 -07:00
Mitchell Hashimoto
4bf9c26af0
Merge pull request #1740 from grosskur/alan-cloudflare-error-msg
...
providers/cloudflare: Better error message
2015-04-29 13:54:25 -07:00
Alan Grosskurth
023b2f94eb
providers/cloudflare: Better error message
...
Currently, if a record isn't found, we get an error like:
Couldn't find record: Record not found
This change improves the error message to add more context:
Couldn't find record ID (123456789) for domain (example.com): Record not found
2015-04-29 13:49:16 -07:00
Clint
daeaba5cd4
Merge pull request #1618 from hashicorp/b-aws-fix-vpc-security-id-update
...
provider/aws: Fix issue with updating VPC Security Group IDs for an Instance
2015-04-29 10:39:14 -05:00
Paul Hinze
950bd92837
Merge pull request #1633 from Banno/route53-zone-back-to-list
...
changing route53_zone.name_servers back to list
2015-04-29 10:38:59 -05:00
Clint Shryock
036d199dd6
provider/aws: Fix issue with updating VPC Security Group IDs for an Instance
...
Currently, we weren't correctly setting the ids, and are setting both
`security_groups` and `vpc_security_group_ids`. As a result, we really only use
the former.
We also don't actually update the latter in the `update` method.
This PR fixes both issues, correctly reading `security_groups` vs.
`vpc_security_group_ids` and allows users to update the latter without
destroying the Instance when in a VPC.
2015-04-29 10:03:57 -05:00
James Stremick
e586d05a7d
Remove some unecessary debug output I added
2015-04-29 10:21:28 -04:00
James Stremick
244639cf3d
Remove some domain checking duplication
2015-04-29 10:21:28 -04:00
James Stremick
b29e9d3b6f
Allow assocation of EIP to ENI
2015-04-29 10:21:08 -04:00
Mitchell Hashimoto
d66012969a
Merge pull request #1658 from bitglue/ebs
...
provider/aws: Implement aws_ebs_volume
2015-04-28 20:37:26 -07:00
Mitchell Hashimoto
77f6945ae7
Merge pull request #1662 from jgjay/elb-sgs-update
...
provider/aws: update elb security groups in-place
2015-04-28 20:30:00 -07:00
Mitchell Hashimoto
b45cd2830f
Merge pull request #1682 from mzupan/master
...
provider/aws: Don't re-do a ASG on a grace healthcheck grace period change
2015-04-28 20:26:00 -07:00
Mitchell Hashimoto
d354cae524
Merge pull request #1685 from ctiwald/master
...
provider/aws: Implement support for various AWS ELB cookie stickiness policies
2015-04-28 20:24:11 -07:00
Mitchell Hashimoto
57af67b314
Merge pull request #1718 from ravenac95/encrypted-ebs-volume-fix
...
provider/aws: Fix connecting encrypted ebs volumes to aws_instances
2015-04-28 20:21:12 -07:00
Reuven V. Gonzales
e8e42decc9
Added docs about m3.medium to tests
2015-04-28 15:19:31 -07:00
Reuven V. Gonzales
25ab54b4e3
Added tests to check for encrypted flag
2015-04-28 15:07:23 -07:00
Reuven V. Gonzales
4ef6d468e9
Actually sends ebs encrypted flag
2015-04-28 10:54:30 -07:00
Phil Frost
dcebff7108
Implement aws_ebs_volume
...
This resource allows the management of EBS volumes not associated with
any EC2 instance.
2015-04-28 12:54:02 -04:00
Sander van Harmelen
764bdbcac9
Merge pull request #1711 from jeroendekorte/b-cloudstack-aclrule
...
Provider/Cloudstack: Fixed the acl rules to support protocol all and icmp
2015-04-28 18:39:21 +02:00
Jeroen de Korte
bf05734b9a
Added some extra tests for the acl-rules
2015-04-28 18:17:02 +02:00
Jeroen de Korte
92128b48a8
Added support for protocol all and fixed the hash diff for icmp and all
2015-04-28 17:05:43 +02:00
Paul Hinze
fc26f7a119
Merge pull request #1331 from tmtk75/dev/aws_ecache
...
provider/aws: resource ElastiCache
2015-04-28 10:00:25 -05:00
Paul Hinze
e4e6ac5d91
providers/aws: add source_security_group to elb
2015-04-28 09:40:19 -05:00
Paul Hinze
c748ce9c9e
Merge pull request #1695 from aznashwan/commfix
...
Fixed/added docstrings in aws provider package.
2015-04-28 08:51:20 -05:00
Paul Hinze
a6de57e5d3
Merge pull request #1687 from dainis/fix_gce_healthcheck_typo
...
Fix - typo in healthcheck names
2015-04-28 08:50:58 -05:00
Paul Hinze
4140253578
Merge pull request #1701 from hashicorp/b-cannot-retrieve-eip
...
provider/aws: fix EIPs on new upstream sdk
2015-04-28 08:50:39 -05:00
Justin Campbell
6f4b7b25c6
providers/dnsimple: default ttl to 3600
...
Since the field is optional and DNSimple defaults it to 3600 on their end, `terraform plan` currently will report `ttl: "3600" => ""`.
2015-04-28 09:20:23 -04:00
Paul Hinze
120cfdce59
provider/aws: fix EIPs on new upstream sdk
...
As we've seen elsewhere, the SDK now wants nils instead of empty arrays
for collections
fixes #1696
thanks @jstremick for pointing me in the right direction
2015-04-27 19:55:26 -05:00
aznashwan
d64dd99d4d
Fixed/added docstrings in aws provider package.
2015-04-27 21:06:49 +03:00
Dainis Tillers
2fa8403673
Fix - typo in healthcheck names
2015-04-27 11:42:50 +03:00
skfmu
2c32988743
Added availability zones for OpenStack block storage.
2015-04-27 05:52:45 +00:00
Christopher Tiwald
99ce8cf25e
aws: Add acceptance test of aws_app_cookie_stickiness_policy.
2015-04-26 18:56:56 -04:00
Christopher Tiwald
0533d60195
aws: Add support for aws_app_cookie_stickiness_policy.
...
This resource represents a session stickiness policy in AWS, and can be
applied to an ELB's client-facing listeners.
2015-04-26 18:56:07 -04:00
Christopher Tiwald
448fb4895f
aws: Add acceptance test of aws_lb_cookie_stickiness_policy.
2015-04-26 18:05:40 -04:00
Christopher Tiwald
0120899f2a
aws: Add support for aws_lb_cookie_stickiness_policy.
...
This resource represents a session stickiness policy in AWS, and can be
applied to an ELB's client-facing listeners.
2015-04-26 18:05:37 -04:00
Mike Zupan
0177be2a66
need to update aws with the change if there is one
2015-04-25 20:00:04 -07:00
Mike Zupan
9fe6317348
don't need to create a new ASG for this change
...
Tested
```
aws_autoscaling_group.rabbit: Modifying...
health_check_grace_period: "200" => "3000"
aws_autoscaling_group.rabbit: Modifications complete
```
2015-04-25 19:50:33 -07:00
Tomotaka Sakuma
f3d9a287e1
support aws resource ElastiCache
2015-04-26 10:53:21 +09:00
Paul Hinze
37c693e8ce
Merge pull request #1672 from PeopleNet/vpc_peering_tags
...
Fix for #1664 . Apply AWS VPC Peering Conn. tags on create.
2015-04-25 09:37:28 -05:00
John Engelman
c2fa397ec8
Fix for #1664 . Apply AWS VPC Peering Conn. tags on create.
2015-04-24 16:12:20 -05:00
Trevor Pounds
fe62312617
Fix comment typos.
2015-04-24 10:25:19 -07:00
Gavin James
c986c65238
update security groups in-place
2015-04-23 20:57:37 +01:00
Henrik Hodne
769f456028
aws: add propagating_vgws to route tables
2015-04-23 15:03:45 +00:00
Luke Amdor
fe2d9ea3cc
sorting the name_server entries
2015-04-23 08:48:19 -05:00
Paul Hinze
10b73f95ae
Merge pull request #1635 from hashicorp/b-net-acls-blank-id
...
providers/aws: network_acl, remove blank filter
2015-04-23 07:32:04 -05:00
Paul Hinze
69ef012dfc
Merge pull request #1632 from hashicorp/f-generate-sg-names
...
unique identifier helper for resources / generate AWS security group names
2015-04-23 07:25:23 -05:00
Panagiotis Moustafellos
6bb8947d16
providers/aws: aws_elb incr. idle_timeout to 60s
...
per docs
http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/config-idle-timeout.html
2015-04-23 12:46:52 +03:00
Paul Hinze
6401635b97
providers/aws: network_acl, remove blank filter
...
The upstream behavior here changed, and the request needs a `nil`
instead of an empty slice to indicate that we _don't_ want to filter on
Network ACL IDs.
fixes #1634
2015-04-22 14:44:31 -05:00
Luke Amdor
6b5138328f
changing route53_zone.name_servers back to list
2015-04-22 13:27:20 -05:00
Paul Hinze
079856620a
provider/aws: set default SG description
...
because requiring a SG description is annoying
2015-04-22 13:27:20 -05:00
Paul Hinze
33de319293
provider/aws: allow SG names to be generated
2015-04-22 12:56:06 -05:00
Paul Hinze
94f703692c
provider/aws: switch to helper for LC names
2015-04-22 12:53:47 -05:00
Mitchell Hashimoto
c1464b1c6d
Merge pull request #1623 from hashicorp/b-private-ip-ssh
...
providers/aws: if no public IP, use private IP for SSH by default
2015-04-22 16:02:04 +02:00
Mitchell Hashimoto
341b2ff864
Merge pull request #1625 from hashicorp/b-panic-network-acl
...
provider/aws: fix potential panic when finding network ACL
2015-04-22 16:01:57 +02:00
Mitchell Hashimoto
f77f77f9f8
provider/aws: fix potential panic when finding network ACL
2015-04-22 12:39:01 +02:00
Mitchell Hashimoto
19b3fa1a76
provider/aws: allow int for network acl entry [GH-1435]
2015-04-22 12:35:23 +02:00
Mitchell Hashimoto
ec38a65dda
providers/aws: if no public IP, use private IP for SSH by default
2015-04-22 12:25:28 +02:00
Mitchell Hashimoto
8ca42f832e
Merge pull request #1525 from Banno/route53-zone-nameservers
...
providers/aws: Expose Route53 zone nameservers for parent zone NS record
2015-04-22 12:10:27 +02:00
Mitchell Hashimoto
9037a3a4bc
Merge pull request #1426 from dainis/master
...
provider/google: add additional options to google provider
2015-04-22 08:50:22 +02:00
Mitchell Hashimoto
d02abb7a8c
Merge pull request #1484 from sparkprime/deprecate-network
...
deprecate google instance 'network' attribute in favor of network_interface
2015-04-22 08:49:04 +02:00
Mitchell Hashimoto
11e6e89f73
provider/aws: make tests public and run them
2015-04-22 08:44:24 +02:00
Mitchell Hashimoto
78f9fb164b
provider/aws: fix compilation errors
2015-04-22 08:42:44 +02:00
Mitchell Hashimoto
887f1b3d12
Merge branch 'elb-connection-settings' of https://github.com/jwaldrip/terraform into jwaldrip-elb-connection-settings
2015-04-22 08:38:19 +02:00
Mitchell Hashimoto
70a0579a12
Merge pull request #1578 from TimeIncOSS/route53-weighted-records
...
provider/aws: Add support for weighted Route53 records
2015-04-22 08:33:28 +02:00
Mitchell Hashimoto
2cecd586c2
Merge pull request #1619 from jgjay/elb-listener-update
...
provider/aws: handle changes to elb listeners after creation
2015-04-22 08:24:36 +02:00
Mitchell Hashimoto
b755459ee3
Merge pull request #1358 from rzh/placement_group
...
provider/aws: support for AWS Placement Group
2015-04-22 08:20:43 +02:00
Mitchell Hashimoto
55f2a3659f
Merge pull request #1550 from ggiamarchi/openstack/lb_vip_floatingip
...
Floating IP support for LBaaS Virtual IP
2015-04-22 08:17:50 +02:00
Mitchell Hashimoto
2996a25ce0
Merge pull request #1597 from aocsolutions/fix_sg_refresh
...
provider/aws: more careful with pointers
2015-04-22 08:12:43 +02:00
Mitchell Hashimoto
3176e5b44a
Merge pull request #1595 from TimeIncOSS/aws-account-protection
...
aws: Allow defining blacklist/whitelist of account IDs
2015-04-22 08:08:01 +02:00
Gavin James
81079bb6ac
handle addition/update/removal of listeners after creation
2015-04-21 23:17:17 +01:00
Clint Shryock
0c5011bea4
provider/aws: Fix issue with empty IPRanges
2015-04-21 10:57:50 -05:00
Mitchell Hashimoto
c8a8f05935
Merge pull request #1601 from bitglue/sts_token
...
provider/aws: support session token in AWS credentials
2015-04-20 15:01:29 -07:00
Matt Good
21b0a03d70
Support for multiple providers of the same type
...
Adds an "alias" field to the provider which allows creating multiple instances
of a provider under different names. This provides support for configurations
such as multiple AWS providers for different regions. In each resource, the
provider can be set with the "provider" field.
(thanks to Cisco Cloud for their support)
2015-04-20 14:14:34 -07:00
Paul Hinze
d55c8d8404
provider/docker: fmt on container resource
2015-04-20 14:18:46 -05:00
Phil Frost
d4c8c528e0
Support session token in AWS credentials
...
Session tokens are necessary to utilize temporary credentials.
http://docs.aws.amazon.com/STS/latest/UsingSTS/Welcome.html
2015-04-20 15:09:04 -04:00
Paul Hinze
3ded884d95
provider/docker: guard against nil NetworkSettings
2015-04-20 12:42:36 -05:00
Stephan Epping
c2319da1aa
Add docker container network settings to output attribute
2015-04-20 12:41:35 -05:00
Mitchell Hashimoto
ccd14a6fcc
Merge pull request #1588 from hashicorp/b-par-prov
...
helper/ssh: add random number to upload path for script [GH-1545]
2015-04-20 10:22:33 -07:00
Nevins Bartolomeo
6da242de03
fixing sg refresh
2015-04-20 11:27:58 -04:00
Radek Simko
150fd00932
AWS account ID protection added
2015-04-20 12:07:39 +01:00
Mitchell Hashimoto
1c0f2f136c
provider/aws: fix vet error, missing fmt param
2015-04-19 18:13:04 -07:00
Mitchell Hashimoto
dda4ae6d12
Merge pull request #1555 from fatih/fix-eip-panic
...
providers/aws: check allocationId only if it's vpc, fixes #1345
2015-04-19 18:10:31 -07:00
Mitchell Hashimoto
2acc9b2e44
Merge pull request #1564 from nickryand/docker_links
...
Added Docker links support to the docker_container resource.
2015-04-18 16:41:17 -07:00
Mitchell Hashimoto
283a3af693
Merge pull request #1576 from bitglue/s3_refresh
...
provider/aws: refresh state for deleted s3 bucket correctly
2015-04-18 16:40:12 -07:00
Mitchell Hashimoto
de8666a5fa
helper/ssh: add random number to script [GH-1545]
2015-04-18 16:09:08 -07:00
Radek Simko
009514f0d3
Allow using deprecated security_groups in NI spec
2015-04-17 21:26:17 +01:00
Clint Shryock
eda987dcfb
provider/aws: Fix issue when creating ELB with no tags
2015-04-17 14:00:27 -05:00
Radek Simko
555f9dfab3
aws: Support for weighted Route53 records added
...
- closes #1155
2015-04-17 18:53:36 +01:00
Phil Frost
47e1ec85f1
Refresh state for deleted s3 bucket correctly
...
If reading an S3 bucket's state, and that bucket has been deleted, don't
fail with a 404 error. Instead, update the state to reflect that the
bucket does not exist. Fixes #1574 .
2015-04-17 13:30:31 -04:00
duncan
e1ac4b9f90
Add Elastic Network Interfaces as route destination
...
Fixes #938
2015-04-17 13:22:31 -04:00
Luke Amdor
c3f9c12426
Merge remote-tracking branch 'refs/remotes/origin/master' into route53-zone-nameservers
2015-04-17 10:11:53 -05:00
Clint
0d1540d448
Merge pull request #1565 from hashicorp/f-aws-upstream-cleanup
...
F aws upstream cleanup
2015-04-17 08:55:11 -05:00
Paul Hinze
3f66e480cc
provisioner/file: expand ~ in source
...
closes #1559
tested manually, since a unit test would be sort of annoying to write.
:)
2015-04-16 18:53:04 -05:00
Paul Hinze
a6325ad18c
Merge pull request #1547 from sparkprime/user-agent
...
Add a UserAgent with version temporarily set to 0.0.0
2015-04-16 16:57:10 -05:00
Clint Shryock
d27a41746c
clean up tags sdk lib
2015-04-16 15:31:40 -05:00
Clint Shryock
3e6822ce08
more cleans ups of SDK reference
2015-04-16 15:28:18 -05:00
Clint Shryock
79fc8223bb
consolidate structure.go
2015-04-16 15:18:01 -05:00
Clint Shryock
ba43b7c963
mass search-replace of ec2SDKconn
2015-04-16 15:05:55 -05:00
Clint Shryock
331f6705b8
providers/aws: cleanup of connections, upgrades network acl test
2015-04-16 15:02:04 -05:00
Nick Downs
f74405d5e7
Added Docker links support to the docker_container resource.
2015-04-16 12:42:21 -07:00
Clint Shryock
c59bfd0ca5
Merge branch 'f-aws-upstream-s3'
...
* f-aws-upstream-s3:
provider/aws: Conver AWS S3 to upstream sdk
2015-04-16 13:51:12 -05:00
Clint Shryock
1da9bc8f4c
fix go formatting after rebase
2015-04-16 13:42:16 -05:00
Clint Shryock
1545dbb803
provider/aws: Convert Route 53 Zone, Record to upstream
2015-04-16 13:41:38 -05:00
Clint Shryock
a5b2437dcf
provider/aws: Convert Instance to use upstream library
2015-04-16 12:01:10 -05:00
Fatih Arslan
86810789c2
providers/aws: check allocationId only if it's vpc, fixes #1345
...
EIP with VPC only returns an allocationID. However, for standard we need
to lookup for PublicIP. When we use an example for standard EC2 instance
(here `t1.micro`):
```
resource "aws_instance" "example" {
ami = "ami-25773a24"
instance_type = "t1.micro"
}
resource "aws_eip" "ip" {
instance = "${aws_instance.example.id}"
}
```
then in this case, allocationID will be nil, but publicIP will be non
nil (which is used later for association the IP). So check for
allocationId only if it's of domain `VPC`.
2015-04-16 16:08:52 +03:00
Clint Shryock
7a99dd48b2
provider/aws: Convert Launch Configuration over to upstream
...
- removes extra ASG connection
2015-04-16 07:10:17 -05:00
Guillaume Giamarchi
d855047af3
Floating IP support for LBaaS Virtual IP
2015-04-16 02:51:05 +02:00
Dave Cunningham
e0905d89f8
Add a UserAgent with version temporarily set to 0.0.0
2015-04-15 18:17:21 -04:00
Luke Amdor
f8b05fa05e
using a set for route53 name_servers
2015-04-15 16:10:02 -05:00
Luke Amdor
46d3ab5ccd
rename delegation_set_name_servers to name_servers
2015-04-15 16:07:50 -05:00
Clint Shryock
210b380d01
go vet updates
2015-04-15 15:32:20 -05:00
Clint Shryock
723be13f96
go fmt asg things
2015-04-15 15:30:35 -05:00
Clint Shryock
1f7d0944f1
provider/aws: Convert AWS ASG to upstream aws-sdk-go
2015-04-15 15:29:59 -05:00
Clint
e97fd27b14
Merge pull request #1539 from hashicorp/f-aws-instance-vpc-sec-ids
...
provider/aws: Add support for separate VPC Security Group IDs attribute
2015-04-15 15:25:03 -05:00
Clint
334b157a5c
Merge pull request #1510 from hashicorp/f-aws-upstream-rds-instance
...
provider/aws: Convert AWS RDS to use upstream aws-sdk-go
2015-04-15 15:23:52 -05:00
Clint Shryock
1ed2219493
don't capitalize IAM
2015-04-15 15:05:44 -05:00
Paul Hinze
9053cc3d18
Merge pull request #1537 from ggiamarchi/openstack/insecure_https
...
OpenStack - Allow to disable HTTPS certificate check
2015-04-15 15:03:26 -05:00
Clint Shryock
df45b2cda8
go fmt db things
2015-04-15 15:02:52 -05:00
Guillaume Giamarchi
b87c05e5a8
Allow to disable HTTPS certificate check
2015-04-15 21:54:44 +02:00
Clint Shryock
470379e7ed
connection naming cleanups
2015-04-15 14:36:08 -05:00
Clint Shryock
9187cab6ac
provider/aws: Convert remaining RDS resources to use upstream library
2015-04-15 14:31:53 -05:00
Clint Shryock
d579b4b75c
provider/aws: Convert AWS RDS to use upstream aws-sdk-go
2015-04-15 14:28:02 -05:00
Clint
220f62eb72
Merge pull request #1532 from hashicorp/f-aws-upstream-elb
...
providers/aws: Conver AWS ELB to upstream
2015-04-15 14:16:24 -05:00
Clint
5a815efdbb
Merge pull request #1531 from hashicorp/f-aws-upstream-vpn-gateway
...
provider/aws: Convert VPN Gateway to upstream
2015-04-15 14:15:03 -05:00
Clint
f948b6205a
Merge pull request #1522 from hashicorp/f-aws-upstream-vpc-peering
...
provider/aws: Convert AWS VPC Peering to upstream
2015-04-15 14:14:02 -05:00
Clint Shryock
3337503eda
update test and documentation for vpc ids in instances
2015-04-15 12:17:21 -05:00
Clint Shryock
97b98b1da6
Merge branch 'master' into f-aws-instance-vpc-sec-ids
...
* master: (511 commits)
Update CHANGELOG.md
core: avoid diff mismatch on NewRemoved fields during -/+
Update CHANGELOG.md
update CHANGELOG
Fix minor error in index/count docs
terraform: remove debug
terraform: when pruning destroy, only match exact nodes, or exact counts
up version for dev
update CHANGELOG
terraform: prune tainted destroys if no tainted in state [GH-1475]
update CHANGELOG
config/lang: support math on variables through implicits
update CHANGELOG
update cHANGELOG
update cHANGELOG
providers/aws: set id outside if/esle
providers/aws: set ID after creation
core: remove dead code from pre-deposed refactor
website: update LC docs to note name is optional
security_groups field expects a list of Security Group Group Names, not IDs
...
2015-04-15 12:12:17 -05:00
Paul Hinze
76701884cd
Merge pull request #1517 from hashicorp/f-simplify-google-instance
...
google: simplify instance metadata schema
2015-04-15 11:48:37 -05:00
Paul Hinze
01e75e0fc3
google: simplify instance metadata schema
...
It doesn't need to be a List of Maps, it can just be a Map.
We're also safe to remove a previous workaround I stuck in there.
The config parsing is equivalent between a list of maps and a plain map,
so we just need a state migration to make this backwards compatible.
2015-04-15 11:01:35 -05:00
Clint Shryock
dc54d6a852
refactor out a refresh fun that wasn't really used
2015-04-15 10:26:39 -05:00