Commit Graph

6229 Commits

Author SHA1 Message Date
Clint Shryock bfaea76b86 more tightly scope s3 bucket object error 2015-08-05 14:27:34 -05:00
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 0c909a4343 Update CHANGELOG.md 2015-08-05 13:32:08 -05:00
Clint 941ce5560a Merge pull request #2925 from hashicorp/b-aws-s3-return-on-err
provider/aws: Return if Bucket not found
2015-08-05 13:31:21 -05:00
Clint Shryock 13e50e684c Document that create_before_destroy cannot depend on resources that are not also create_before_destroy 2015-08-05 11:59:08 -05:00
Paul Hinze 29d4a3ee0a Update CHANGELOG.md 2015-08-05 11:14:53 -05:00
Paul Hinze fd10cebb21 Merge pull request #2943 from hashicorp/b-allow-external-eni-attachments 2015-08-05 11:13:49 -05:00
Paul Hinze 3de3002b49 provider/aws: allow external ENI attachments
If Terraform creates an ENI and it's attached out of band, Terraform
should not attempt to remove the attachment on subsequent runs.

fixes #2436
fixes #2881
2015-08-05 11:07:07 -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
Clint 1f80313004 Merge pull request #2938 from PavelVanecek/patch-1
Update AWS provider documentation
2015-08-05 08:12:59 -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
Cameron Stokes ca252ccee9 Changed math example to use spaces between math operator 2015-08-04 11:12:24 -07:00
Cameron Stokes 30d57bf1ec Clarify math operations available for interpolation
As reported in #2782, the math operations, specifically subtraction,
can cause unexpected behavior when resource or variable names use hyphens.

I added clarification about using spaces with math operators as well as
which operations are available.
2015-08-04 11:09:43 -07:00
Radek Simko 41c732dd6c Merge pull request #2930 from TimeIncOSS/docs-iam-role-policy-fix
docs/aws: Fix example of aws_iam_role_policy
2015-08-04 12:13:18 +01:00
Clint Shryock 8d5fe93152 conditionally set InstanceInitiatedShutdownBehavior 2015-08-04 06:09:47 -05:00
Radek Simko 57c2c90e20 docs/aws: Fix example of aws_iam_role_policy 2015-08-04 11:57:05 +01:00
Clint Shryock 83827a5cb7 provider/aws: S3 bucket test that should fail 2015-08-03 16:30:54 -05:00
Clint Shryock c10c47623e provider/aws: Return if Bucket not found 2015-08-03 16:17:01 -05: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
Clint c870f45ba6 Update CHANGELOG.md 2015-08-03 16:05:50 -05:00
Clint 27b1aa6637 Merge pull request #2922 from hashicorp/azure-settings-file
provider/azure: Allow settings_file to accept XML string
2015-08-03 16:05:00 -05:00
Paul Hinze da63d200c9 Update CHANGELOG.md 2015-08-03 15:59:59 -05:00
Paul Hinze 349008c29a Merge pull request #2923 from hashicorp/b-meta-lost-when-destroy-fails
helper/schema: record schema version when destroy fails
2015-08-03 15:58:50 -05:00
Paul Hinze 7eb72e7a12 helper/schema: record schema version when destroy fails
This was just a missed exit from the resource.Apply function -
subsequent refreshes would add the SchemaVersion back into the state,
but having the state recorded once without the meta information can
cause problems with Atlas's remote state checksumming.
2015-08-03 15:53:15 -05:00
Clint Shryock a7543de393 settings file is not required 2015-08-03 15:34:34 -05:00
Clint Shryock 2a5c18d88b provider/azure: Allow settings_file to accept XML string 2015-08-03 15:31:25 -05:00
Radek Simko 382c0ba23d command/output: Update test since we now allow printing everything 2015-08-03 12:44:41 +01:00
Eric Connell 85d1d15d81 output command supports printing all outputs
if no output name is specified all outputs are displayed
fixed formating and added missing help for -module parameter
2015-08-03 12:22:40 +01:00
Patrick Gray 99fae273eb add note to aws_iam_policy_attachment explaining its use/limitations 2015-08-02 16:44:43 -04:00
Paul Hinze 2cea7c7d0c docs: clarify template_file path information
- change example to use the most commonly necessary path format w/
   `path.module`
 - link to path variable page in description

/cc @KFishner
2015-07-31 11:44:07 -05:00
Radek Simko 6d0a2df65f Merge pull request #2905 from TimeIncOSS/google-docs-resort
google: Sort resources by alphabet in docs
2015-07-31 15:49:59 +01:00
Radek Simko 96d6531171 google: Sort resources by alphabet in docs 2015-07-31 15:07:55 +01:00
Mitchell Hashimoto 207fd3b9dd Merge pull request #2900 from dlsniper/go1.5-support
Support go get in go 1.5 (fixes #2893)
2015-07-30 17:35:49 -07:00
Florin Patan a75ca1e25c Support go get in go 1.5 2015-07-31 00:34:58 +02:00
Clint a370268872 Update CHANGELOG.md 2015-07-30 16:13:13 -05:00
Clint 6263d7b7ec Merge pull request #2897 from hashicorp/b-aws-sg-rule-ref
provider/aws: Fix issue in Security Group Rules where the Security Group is not found
2015-07-30 16:12:35 -05:00
Clint a563fbc57c Merge pull request #2899 from jszwedko/patch-1
aws_network_interface attachment block is not required
2015-07-30 15:28:11 -05: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 44f470514c provider/aws: Add S3 Bucket Object (supercedes #2079) 2015-07-30 15:17:37 -05: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
Clint Shryock f4fb053982 provider/aws: Fix issue in Security Group Rules where the Security Group is not found 2015-07-30 14:10:19 -05:00
Dave Cunningham 6e7c6122e9 Merge pull request #2894 from sparkprime/optional_target_pool
Make target_pools optional
2015-07-30 13:52:44 -04:00
Clint b9d3f27c5f Update CHANGELOG.md 2015-07-30 10:50:34 -05:00
Clint c14f4f442a Update CHANGELOG.md 2015-07-30 10:49:56 -05:00
Clint 649e2ab572 Merge pull request #2825 from phstc/dynamodb-local
provider/aws: Allow to change the DynamoDB Endpoint
2015-07-30 10:48:51 -05:00
Pablo Cantero 5930f22974 dynamodb-local Update AWS config
https://github.com/hashicorp/terraform/pull/2825#issuecomment-126353610

Tks @catsby
2015-07-30 12:21:03 -03:00
Pablo Cantero 28bef7c0c7 Merge branch 'master' into dynamodb-local 2015-07-30 12:16:07 -03:00
Dave Cunningham 65ba4c1b06 Make target_pools optional 2015-07-30 10:46:16 -04:00
Clint 9c8ae86db5 Update CHANGELOG.md 2015-07-30 09:29:19 -05:00