Commit Graph

443 Commits

Author SHA1 Message Date
Clint Shryock 285b4061db Merge remote-tracking branch 'upstream/master' into f-aws-s3-object-pr-2079
* upstream/master:
  Update CHANGELOG.md
  Update CHANGELOG.md
  provider/aws: allow external ENI attachments
  Update AWS provider documentation
  docs/aws: Fix example of aws_iam_role_policy
  provider/aws: S3 bucket test that should fail
  provider/aws: Return if Bucket not found
  Update CHANGELOG.md
  Update CHANGELOG.md
  helper/schema: record schema version when destroy fails
  settings file is not required
  provider/azure: Allow settings_file to accept XML string
  add note to aws_iam_policy_attachment explaining its use/limitations
  docs: clarify template_file path information
  google: Sort resources by alphabet in docs
  Support go get in go 1.5
  Update CHANGELOG.md
  aws_network_interface attachment block is not required
  provider/aws: Fix issue in Security Group Rules where the Security Group is not found
2015-08-05 13:45:06 -05:00
Clint 3e1300e96b Merge pull request #2913 from GrayCoder/master
add note to aws_iam_policy_attachment explaining its use/limitations
2015-08-05 10:00:39 -05:00
Pavel Vaněček d649af8813 Update AWS provider documentation
Changed `AWS_SECURITY_TOKEN` to `AWS_SESSION_TOKEN`
2015-08-05 14:40:26 +02:00
Radek Simko 57c2c90e20 docs/aws: Fix example of aws_iam_role_policy 2015-08-04 11:57:05 +01:00
Calvin French-Owen cb2d90a7d9 provider/aws: Add arn attribute for DynamoDB tables
This commit exports the `arn` as well as the `id`, since IAM
roles require the full resource name rather than just the table
name. I'd even be in favor or having `arn` as the `id` since the
<region, tablename> pair is the uniqueness constraint, but this
will keep backwards compatibility:

http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_CreateTable.html
2015-08-03 14:10:18 -07:00
Patrick Gray 99fae273eb add note to aws_iam_policy_attachment explaining its use/limitations 2015-08-02 16:44:43 -04:00
Jesse Szwedko 5b740c02db aws_network_interface attachment block is not required
Mark the `attachment` field of `aws_network_interface` as optional because it is not required to create a network interface
2015-07-30 16:25:50 -04:00
Clint Shryock f6bad310ee update docs 2015-07-30 15:17:16 -05:00
Clint Shryock 5c6083e1c4 Merge branch 'master' into f-aws-s3-object-pr-2079
* master: (720 commits)
  Update CHANGELOG.md
  Update CHANGELOG.md
  dynamodb-local Update AWS config https://github.com/hashicorp/terraform/pull/2825#issuecomment-126353610
  Make target_pools optional
  Update CHANGELOG.md
  code formatting
  Update CHANGELOG.md
  providers/google: Fix reading account_file path
  providers/google: Fix error appending
  providers/google: Return if we could parse JSON
  providers/google: Change account_file to JSON
  providers/google: Default account_file* to empty
  providers/google: Add account_file/account_file_contents ConflictsWith
  providers/google: Document account_file_contents
  providers/google: Use account_file_contents if provided
  providers/google: Add account_file_contents to provider
  Update CHANGELOG.md
  Update CHANGELOG.md
  dynamodb-local Use ` instead of : to refer region to keep the consistency with the provider docs
  dynamodb-local Update aws provider docs to include the `dynamodb_endpoint` argument
  ...
2015-07-30 14:30:35 -05:00
Pablo Cantero 28bef7c0c7 Merge branch 'master' into dynamodb-local 2015-07-30 12:16:07 -03:00
Clint Shryock 30572212f2 Merge branch 'master' into pr-2779
* master: (86 commits)
  providers/google: Fix reading account_file path
  providers/google: Fix error appending
  providers/google: Return if we could parse JSON
  providers/google: Change account_file to JSON
  providers/google: Default account_file* to empty
  providers/google: Add account_file/account_file_contents ConflictsWith
  providers/google: Document account_file_contents
  providers/google: Use account_file_contents if provided
  providers/google: Add account_file_contents to provider
  Update CHANGELOG.md
  Update CHANGELOG.md
  use d.Id()
  Update CHANGELOG.md
  Update CHANGELOG.md
  scripts: change website_push to push from HEAD
  update analytics
  core: fix crash on provider warning
  provider/aws: Update source to comply with upstream breaking change
  Update CHANGELOG.
  provider/aws: Fix issue with IAM Server Certificates and Chains
  ...
2015-07-29 15:54:56 -05:00
Pablo Cantero 2f6d20837f dynamodb-local Update aws provider docs to include the `dynamodb_endpoint` argument 2015-07-29 13:33:51 -03:00
Tom Hummel 6931e8520e aws_sqs_queue argument description fix
the descriptions of `delay_seconds` and `visibility_timeout_seconds` appear to be swapped.
2015-07-25 12:49:10 -07:00
Jesse Szwedko 5554942721 This adds the source_dest_check attribute to the aws_network_interface resource
Defaults to true to be consistent with AWS
2015-07-23 06:16:51 +00:00
John Engelman cbe9be4571 Add website_domain for S3 buckets. 2015-07-22 10:38:28 -05:00
Clint f979fd7dee Merge pull request #2571 from TimeIncOSS/f-aws-autogenerated-elb-name
provider/aws: Allow ELB name to be generated
2015-07-21 15:52:36 -05:00
Marc Tamsky 521451db4d provider/aws/aws_instance: add new argument `instance_initiated_shutdown_behavior`,
accepts string values of 'stop' or 'terminate'.

Signed-off-by: Marc Tamsky <tamsky@users.noreply.github.com>
2015-07-18 09:45:34 -07:00
Sam Clinckspoor b54b35904d Fixed typo in AWS_CLOUDWATCH_METRIC_ALARM docs 2015-07-16 17:27:33 +02:00
Jon Simpson a2e14c0464 Fix typo 2015-07-15 16:48:53 +01:00
Clint abe62e635a Merge pull request #2724 from hashicorp/f-aws-asg-updates
provider/aws: Improved Auto Scaling Groups updates
2015-07-15 08:42:54 -05:00
Radek Simko 650b13ebd4 provider/aws: Add docs for vpc_endpoint 2015-07-14 18:34:21 +01:00
Clint Shryock 55a1a31c2b provider/aws: document that availability zones are now optional in ASGs 2015-07-14 10:24:16 -05:00
Anthony Stanton 49a1f21a09 Use correct terms in DB Subnet Group docs 2015-07-09 17:39:05 +02:00
Clint b169a53786 Merge pull request #2642 from hashicorp/f-aws-elasticache-maintenance-window
provider/aws: Add maintenance window to ElastiCache cluster
2015-07-08 13:10:32 -06:00
Clint Shryock ef28007988 merge master 2015-07-08 13:05:33 -06:00
Patrick Gray b32008804e fix markdown for aws_iam_policy_attachment 2015-07-08 14:25:57 -04:00
Clint 82d142cc5f Merge pull request #2634 from hashicorp/f-aws-elasticache-redis-s3-snap
provider/aws: Add support for restoring from Redis backup stored in S3
2015-07-08 11:51:23 -06:00
Clint Shryock 49a01ee787 provider/aws: Add maintenance window to ElastiCache cluster
Implements #2612
2015-07-07 10:41:46 -06:00
Clint Shryock 91ea40d157 provider/aws: Update Launch Configuration docs to reflect required device name 2015-07-06 16:32:18 -06:00
Clint Shryock edf8948d52 provider/aws: Add support for restoring from Redis backup stored in S3
Fixes #2377
2015-07-06 16:19:15 -06:00
Radek Simko 1e56b607a0 Merge pull request #2599 from kelcecil/ebs_optimized
Add ebs_optimized argument to launch_configuration docs
2015-07-05 09:29:58 +02:00
Radek Simko 8d6e2eb064 Merge pull request #2609 from CpuID/cpuid_ecs_task_definition_docs
Updated docs for aws_ecs_task_definition, to avoid confusion.
2015-07-03 19:53:59 +02:00
Nathan Sullivan bba53d46a6 oops :) 2015-07-04 03:41:44 +10:00
Nathan Sullivan 21a336fb4a updates as per @radeksimko's comments 2015-07-03 18:30:55 +10:00
Radek Simko 03dc6c4879 Merge pull request #2610 from CpuID/cpuid_ecs_service_docs_iam
Fix aws_ecs_service iam_role docs
2015-07-03 07:45:31 +02:00
Kel Cecil 857f139404 Add ebs_optimized argument to launch_configuration docs 2015-07-02 13:03:27 -04:00
Clint 460d49fd52 Merge pull request #2062 from reverbdotcom/adding-rds-snapshots
Adding rds snapshots
2015-07-02 08:56:51 -05:00
Nathan Sullivan 5edbb37994 fix variable for aws_iam_role 2015-07-02 21:53:01 +10:00
Nathan Sullivan 928d5f76ab updated docs for aws_ecs_task_definition to avoid confusion 2015-07-02 20:34:58 +10:00
Paul Hinze 3dc055f18b Merge pull request #2582 from Tomohiro/fix-iam-user-access-key-example
Remove status argument from `aws_iam_access_key` example usage
2015-07-01 13:23:31 -05:00
Daisuke Fujita 280313ed24 Fix page description of aws_iam_group_membership 2015-07-02 01:38:40 +09:00
Daisuke Fujita cf432a5acd Fix page title of aws_iam_group_membership 2015-07-02 01:37:36 +09:00
Tomohiro TAIRA 405ed57544 Remove status argument from `aws_iam_access_key`
`aws_iam_access_key` resource is not supported `status` field.

Example from https://www.terraform.io/docs/providers/aws/r/iam_access_key.html:

    resource "aws_iam_access_key" "lb" {
        user = "${aws_iam_user.lb.name}"
        status = "Active"
    }

    resource "aws_iam_user" "lb" {
        name = "loadbalancer"
        path = "/system/"
    }

Result:

    $ terraform plan
    There are warnings and/or errors related to your configuration. Please
    fix these before continuing.

    Errors:

      * aws_iam_access_key.lb: "status": this field cannot be set
2015-07-01 13:07:31 +09:00
Adam Enger d206d6d5d8 Adding snapshot_identifier to db_instance docs 2015-06-30 15:33:13 -05:00
John Ewart 7b7d754bb5 Minor change to docs 2015-06-30 11:43:13 -07:00
John Ewart ca7fe86c67 Update DynamoDB example docs to remove non-key attributes; update test to remove non-key attribute from attribute set to prevent infinite planning loops 2015-06-30 11:38:16 -07:00
Radek Simko 676d490d40 provider/aws: Allow elb name to be generated 2015-06-30 13:13:51 +01:00
Radek Simko 8acc55ae13 Merge pull request #2402 from hashicorp/f-aws-ecs-td-deregistration
provider/aws: Deregister ECS task definition correctly
2015-06-30 12:36:58 +01:00
Radek Simko f67410db53 Merge pull request #2534 from dtan4/ec-subnet-group-subnet-ids
Make elasticache_subnet_group subnet_ids as required argument
2015-06-30 08:45:48 +01:00
Radek Simko f5eb581425 provider/aws: ecs task definition is deregistered correctly 2015-06-29 23:37:20 +01:00
Paul Hinze bc06deace2 Merge pull request #2535 from managedbyq/d-bogus-known-issue-dhcp-options
aws/docs: Removes bogus known linked issue from docs.
2015-06-29 17:17:54 -05:00
Clint 791787047f Merge pull request #2395 from GrayCoder/master
Add resource "aws_iam_policy_attachment" to attach a managed policy to users, roles, or groups
2015-06-29 14:33:34 -05:00
Mitchell Hashimoto da136d1dff website: make clear that verbose policies are needed for s3_bucket 2015-06-28 22:42:13 -07:00
Camilo Aguilar f6cd88bcc4 aws/docs: Removes bogus known linked issue from docs.
aws-sdk-go does what it is supposed to do. Some DHCP clients
are just too weird.
2015-06-28 09:31:23 -04:00
Daisuke Fujita 562cf596dc Make elasticache_subnet_group subnet_ids essential 2015-06-28 16:13:25 +09:00
Clint 079e4505a8 Merge pull request #2276 from SamClinckspoor/resource-aws-elasticache-parameter-group
provider/aws elasticache parameter group
2015-06-26 14:01:19 -05:00
Clint Shryock 54ddd55c63 add note on availability 2015-06-25 11:09:30 -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
Joshua Garnett d23f534d26 Adding support for detailed monitoring of instances 2015-06-25 10:58:28 -04:00
Mitchell Hashimoto f6b56a46ba Merge pull request #2480 from dtan4/fix-elasticache-websites
website: Fix page titles and descriptions of ElastiCache websites
2015-06-24 23:18:02 -07:00
Daisuke Fujita 75be0a1529 Fix page description of elasticache_cluster 2015-06-25 15:11:49 +09:00
Daisuke Fujita 0850838dfc Fix page description of elasticache_subnet_group 2015-06-25 15:11:23 +09:00
Daisuke Fujita 19b6e2816b Fix page title of elasticache_subnet_group 2015-06-25 15:10:49 +09:00
Daisuke Fujita 30bc6afeed Fix page description of elasticache_security_group 2015-06-25 15:09:47 +09:00
Mitchell Hashimoto c223518085 Merge pull request #2332 from TimeIncOSS/docs-cache-nodes
provider/aws: Add docs for elasticache_cluster - cache_nodes
2015-06-24 23:08:09 -07:00
Daisuke Fujita 5da9dd52e8 Fix page title of elasticache_security_group 2015-06-25 15:07:28 +09: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
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 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 cbddab8a69 provider/aws: Add aws_launch_configuration.enable_monitoring 2015-06-20 23:40:29 +01:00
Patrick Gray 8abca07889 add markdown 2015-06-18 11:54:26 -04:00
Radek Simko 079ba4e310 provider/aws: route53 delegation set docs added 2015-06-17 23:25:32 +01:00
Alex Pilon 14f4e5fe54 provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm 2015-06-17 23:10:23 +01:00
Clint Shryock 641a86effa additional attributes exported 2015-06-17 16:29:31 -05:00
Clint Shryock cbb6b97f7e provider/aws: Docs for FlowLog resource 2015-06-17 16:29:31 -05:00
Clint b132dd284e Merge pull request #2121 from johnewart/dynamodb
DynamoDB Support
2015-06-17 09:47:13 -05:00
Paul Hinze f1a88fca5b Merge pull request #2350 from thegedge/fix-aws-docs
provider/aws: grammar fix in the db_instance docs.
2015-06-15 12:34:53 -05:00
Jason Gedge 11b136f503 Grammar fix in the aws_db_instance docs. 2015-06-15 13:32:30 -04:00
Paul Hinze e514e16215 docs: add route53_health_check to sidebar
/cc @rubbish
2015-06-15 11:08:37 -05: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
Radek Simko 487164f0cf provider/aws: Add docs for elasticache_cluster - cache_nodes 2015-06-13 14:06:14 +01:00
Chris Bednarski f01154366a Merge with changes from master 2015-06-09 12:12:47 -07:00
Sam Clinckspoor c22f271fb0 Cleaned indentation of example 2015-06-09 17:57:31 +02:00
Clint Shryock eee7a2778d add doc file that I forgot 2015-06-08 16:18:47 -05:00
Sam Clinckspoor dedbac5a46 added documentation 2015-06-08 22:51:56 +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
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
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
Ian MacLeod 20558fcf70 Fix page title for aws_elasticache_cluster 2015-06-07 12:42:38 -07:00
ketzacoatl 4bbe93552a Minor correction to aws_s3_bucket docs 2015-06-05 19:20:23 -04:00
Radek Simko 2df0e734ae docs: Fix wrong title (aws_autoscaling_notification) 2015-06-05 23:47:50 +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
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
Clint Shryock f8eb5e4b11 clarify docs 2015-06-05 15:42:04 -05:00
Clint Shryock 3858ee0ade add docs for asg notifications 2015-06-05 10:14:24 -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