Commit Graph

5678 Commits

Author SHA1 Message Date
Sander van Harmelen c62370f9e9 Add a function to load JSON directly
Without this 12 line function it’s impossible to use any of the
Terraform code without the need for having the files on disk. As more
and more people are using (parts of) Terraform in other software, this
seems to be a very welcome addition. It has no negative impact on
Terraform itself whatsoever (the function is never called), but it
opens up a lot of other use cases.

Next to the single new function, I renamed the existing function (and
related tests) to better reflect what the function does. So now there
is a `LoadDir` function which calls `LoadFile` for each file, which
kind of made sense to me, especially when now adding a `LoadJSON`
function as well.

But of course if the rename is a problem, I can revert that part as
it’s not related to the added `LoadJSON` function.

Thanks!
2015-06-23 16:15:26 +02: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 6fd4f65946 Merge pull request #2428 from ajmath/fix-remote-state-docs
Fixes incorrect usage of terraform_remote_state in docs
2015-06-23 08:59:54 -05:00
Andrew Matheny 0ecd1fd054 Fixes incorrect usage of terraform_remote_state in docs
I was getting an error about a missing 'name' parameter when using the snippet from the docs that referenced a path value.  Looking into the source, I found it was actually supposed to be name for the atlas provider.
2015-06-23 00:56:18 -04:00
Paul Hinze ce8baea6ae Update CHANGELOG.md 2015-06-22 18:13:52 -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 118e021d1b Merge pull request #2413 from TimeIncOSS/version-separation
Expose Terraform version
2015-06-22 18:06:14 -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
Paul Hinze a7cbbbd258 communicator/ssh: bastion host support
* adds `bastion_*` fields to `connection` which add configuration for a
   bastion host
 * if `bastion_host` is set, connect to that host first, then jump
   through it to make the SSH connection to `host`
 * enables SSH Agent forwarding by default
2015-06-22 18:00:18 -05:00
Paul Hinze e4931771af Update CHANGELOG.md
cc @mitchellh
2015-06-22 17:58:30 -05:00
Paul Hinze a224c134ff Merge pull request #2408 from hashicorp/f-ssh-agent-default-true
communicator/ssh: switch agent default to true
2015-06-22 17:55:46 -05:00
Clint Shryock 8e23607b67 update docs to include IAM roles 2015-06-22 10:07:43 -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
Clint Shryock d5f962b14b clean up extra indentation 2015-06-22 09:25:27 -05:00
Radek Simko b7d41d2eed Add -no-color to help text 2015-06-22 13:14:01 +01:00
Radek Simko cdcd11419e Add -no-color option for subcommands 2015-06-21 21:52:11 +01:00
Radek Simko 0fc8882e29 Expose Terraform version internally & externally 2015-06-21 12:24:42 +01: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
Paul Hinze 44de0996c5 communicator/ssh: switch agent default to true
This changes SSH Agent utilization from opt-in to opt-out, bringing
Terraform in line with the behavior of Packer and the `ssh` command
itself.

But skip SSH agent connections if the SSH_AUTH_SOCK env var doesn't exist,
whcih means there's no agent to connect to.
2015-06-19 17:14:43 -05:00
Sander van Harmelen 0b1dbf31a3 core: close provider/provisioner connections
Currently Terraform is leaking goroutines and with that memory. I know
strictly speaking this maybe isn’t a real concern for Terraform as it’s
mostly used as a short running command line executable.

But there are a few of us out there that are using Terraform in some
long running processes and then this starts to become a problem.

Next to that it’s of course good programming practise to clean up
resources when they're not needed anymore. So even for the standard
command line use case, this seems an improvement in resource management.

Personally I see no downsides as the primary connection to the plugin
is kept alive (the plugin is not killed) and only unused connections
that will never be used again are closed to free up any related
goroutines and memory.
2015-06-19 21:52:50 +02:00
Clint 7850bb39d5 Update CHANGELOG.md 2015-06-19 14:01:22 -05:00
Paul Hinze e475764e51 Update CHANGELOG.md 2015-06-19 13:57:11 -05:00
Paul Hinze 87bea0fd4b Merge pull request #2394 from aznashwan/f-azure-affinity-group
provider/azure: Added affinity group resource.
2015-06-19 13:56:54 -05:00
aznashwan 9b5c99ba28 Added affinity group resource. 2015-06-19 21:53:36 +03:00
Robin Walsh ad17cf55a0 Allowing at-rest encryption when using S3
This change allows the user to specify `-backend-config="encrypt=1"`
to tell S3 to encrypt the data that's in the bucket when using S3
for remote config storage.

The encryption uses "Amazon S3-managed encryption keys" so it should
not require any further user intervention.

A line was added to the unit test just for coverage.
The acceptance test was modified to:
  a) Use encryption
  b) Push some test data up to the bucket created to ensure
     that Amazon accepts the header.
2015-06-19 11:33:03 -07:00
Clint f045e9e8d1 Merge pull request #2376 from hashicorp/fix-security-group-rule-hashing-with-source-sg
Consider security groups with source security groups when hashing
2015-06-19 11:50:44 -05: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
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 079ba4e310 provider/aws: route53 delegation set docs added 2015-06-17 23:25:32 +01: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
Radek Simko ad4ff53120 Update CHANGELOG.md 2015-06-17 23:23:21 +01:00
Radek Simko 97b6a0a4b2 Merge pull request #2201 from hashicorp/f-aws-scaling-policies
provider/aws: Add autoscaling_policy + cloudwatch_metric_alarm
2015-06-17 23:21:27 +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