Commit Graph

2277 Commits

Author SHA1 Message Date
Sander van Harmelen 2ba8dc38fa Switch to go-multierror
It seems there are 4 locations left that use the `helper/multierror`
package, where the rest is TF settled on the `hashicorp/go-multierror`
package.

Functionally this doesn’t change anything, so I suggest to delete the
builtin version as it can only cause confusion (both packages have the
same name, but are still different types according to Go’s type system.
2015-09-27 18:58:48 -07:00
Dave Cunningham 2619b66e21 Merge pull request #3242 from lwander/b-gce-network-interface-name
provider/gce: Instance Template Network Interface Should be URL
2015-09-25 16:40:16 -04:00
Dave Cunningham 442d64d7c2 Merge pull request #3323 from lwander/r-gce-refactor-operations
provider/gce: Refactored Operation Wait Code
2015-09-25 16:32:31 -04:00
Hany Fahim 7852248f0e Moved project block down 2015-09-24 17:04:45 -04:00
Hany Fahim fc89f576ca Change IS_GLOBAL_RESOURCE to UnlimitedResourceID to keep terminology in sync with CloudStack 2015-09-24 16:49:21 -04:00
Lars Wander 158af9d0d4 Refactored wait code to delete duplicated code & share functionality 2015-09-24 16:30:12 -04:00
Hany Fahim 7b4bb968d6 Add project parameter to cloudstack_template resource 2015-09-24 16:28:40 -04:00
Hany Fahim aa950be63b Use constant for global resources 2015-09-24 16:16:12 -04:00
Hany Fahim 03d7c1fa7d Allow for -1 for Zone ID, which is valid in CloudStack 2015-09-24 15:57:25 -04:00
Paul Hinze 50b8161da1 Merge pull request #2008 from dupuy/secgrp-delta-remove-then-add
remove security groups (by name) before adding security groups (by id)
2015-09-24 14:14:48 -05:00
Sargurunathan Mohan 6b2d6f5ae4 go fmt code 2015-09-23 16:41:48 -07:00
Sargurunathan Mohan 803b33bcae return nil and exit out of the function for IAM instance profiles 2015-09-23 16:40:46 -07:00
stack72 04722c88c5 Renaming the unit tests for the ELB Name validation to be TestResource to keep inline with existing conventions 2015-09-21 22:08:33 +01:00
stack72 91274c9a90 Test spike to extract the function that does the validation for ELB Name. This will allow me to test this in isolation to make sure that the validation rules work as expected 2015-09-21 22:00:51 +01:00
stack72 679563951c Added the validation for the app-cookie-stickiness-policy after the AWS API returned an error 2015-09-19 20:01:49 +01:00
stack72 9ac39a3edf Enforcing lowercase on the DO Size. This is used for the sizeslug property of API calls - according to their [docs](https://developers.digitalocean.com/documentation/v1/sizes/) this always looks to be lowercase on the slug. I cannot find any definite answer to this question though 2015-09-18 19:42:37 +01:00
stack72 c753c1e91d Changing the PR for the db_param_group to ensure validation rather than documentation 2015-09-18 13:04:33 +01:00
Paul Hinze 028e50bae6 Merge pull request #3250 from stack72/aws-elasticache-configuration_endpoint
Adding configuration endpoint to the elasticache cluster nodes
2015-09-17 14:27:10 -05:00
stack72 2b7a13b609 Adding some other simple S3 Bucket Object (Optional) Inputs 2015-09-17 20:13:06 +01:00
Radek Simko f90d2442ca Merge pull request #3196 from elblivion/allow-r53-zero-weighted-rr-creation
provider/aws: Allow weight = 0 in Route53 records
2015-09-17 18:14:30 +01:00
Anthony Stanton 44f2d85de8 Add acceptance test
=== RUN   TestAccAWSRoute53Record_weighted
--- PASS: TestAccAWSRoute53Record_weighted (249.19s)
2015-09-17 17:20:12 +02:00
Dave Cunningham 488738163b Merge pull request #3240 from lwander/f-gce-bucket-website
provider/gce: Implement "website features" for GCE buckets
2015-09-16 17:37:32 -04:00
Radek Simko e3ceda37fb provider/aws: Add acceptance test for cloudwatch_log_group 2015-09-16 22:34:26 +01:00
Radek Simko b224abb7a9 provider/aws: Add cloudwatch_log_group 2015-09-16 22:28:01 +01:00
stack72 68c187c01e Changing the ElastiCache Cluster configuration_engine to be on the cluster, not on the cache nodes 2015-09-16 17:15:31 +01:00
Paul Hinze 96317a6a38 Merge pull request #3152 from dwradcliffe/read_source_dest_check_state
provider/aws: read instance source_dest_check and save to state
2015-09-16 10:29:37 -05:00
stack72 029f1fa572 Adding configuration endpoint to the elasticache cluster nodes 2015-09-16 13:06:54 +01:00
Dave Cunningham 30c27362b1 Merge pull request #3213 from lwander/f-gce-vpn
provider/gce: VPN resources, documentation, tests and example
2015-09-15 16:29:41 -04:00
Lars Wander 6850786422 Documentation and tests written for GCE VPN config 2015-09-15 16:13:48 -04:00
Lars Wander 4fd5c72540 Fix "malformed url" bug in instance template when using network name 2015-09-15 15:59:26 -04:00
Lars Wander 53e7058dee Address issue #2292 2015-09-15 15:06:52 -04:00
Lars Wander b240628799 Refactored project/instance metadata to use same code whenever possible
Also added optimistic locking to instance metadata
2015-09-15 14:06:26 -04:00
thrashr888 55f3c8c764 provider/aws: aws_elasticache_cluster normalizes name to lowercase 2015-09-14 16:50:53 -07:00
Anthony Scalisi 198e1a5186 remove various typos 2015-09-11 11:56:20 -07:00
zpatrick 5256a6df6b fix formatting 2015-09-10 18:37:17 +00:00
Anthony Stanton a0d9a4c96f Workaround to allow weight = 0 in Route53 RRs
Moved the GetOk to a Get in the set_identifier block so
we can create a zero-weighted RR - otherwise this falls foul
of a check in GetOk.

See https://github.com/hashicorp/terraform/issues/3189
2015-09-10 10:50:50 +02:00
zpatrick 03f94d66ae adding content field to s3_bucket_object 2015-09-09 21:13:36 +00:00
Dave Cunningham b91df72371 Merge pull request #3192 from lwander/f-gcs-bucket-object
Allow GCE users to upload objects to buckets by file
2015-09-09 12:27:37 -04:00
Lars Wander 602acadde8 Implemented GCS bucket objects 2015-09-08 16:57:18 -04:00
Sander van Harmelen 6cf126defa Merge pull request #3020 from davemcdermid/azure-join-domain
Added join_domain feature to Azure Instance resource
2015-09-08 22:54:38 +02:00
Dave Cunningham 455ba7bdb1 Merge pull request #3131 from lwander/gce-fix-metadata
Brought GCE project metadata code up to spec with GCE API change
2015-09-08 15:51:25 -04:00
Paul Hinze 8559b02099 Merge pull request #3001 from sarguru/iam_profile_validation
Fail silently when account validation fails while from instance profile
2015-09-08 13:29:09 -05:00
Radek Simko 1b59d874fb Merge pull request #3038 from TimeIncOSS/f-google-backend-service
google: Add google_compute_backend_service
2015-09-08 16:59:45 +01:00
Radek Simko 567c299a84 Use computed fingerprint 2015-09-08 12:00:22 +01:00
Radek Simko a36f893d7e Rename backend_service_test to compute_backend_service_test 2015-09-08 11:56:20 +01:00
Radek Simko 011b62974a google: Add acc. tests for google_compute_backend_service 2015-09-08 10:22:14 +01:00
Radek Simko 7d3976e7b6 google: Add new resource - google_compute_backend_service 2015-09-08 10:22:14 +01:00
Radek Simko cff26ea65a Add extra debugging for google OperationWaiter 2015-09-08 10:22:14 +01:00
Sander van Harmelen ce50f35679 Small refactor of the CloudStack load balancer tests
This makes the code a little more generic and inline with the other
code. Functionally the same things are tested.
2015-09-08 11:19:41 +02:00
Sander van Harmelen 62f8883df0 Merge pull request #3178 from glenjamin/cloudstack-loadbalancer-no-firewall
Expand cloudstack_loadbalancer_rule to work without vpcs
2015-09-08 10:14:49 +02:00
Glen Mailer 981c40fec1 Expand cloudstack_loadbalancer_rule to work without vpcs
When using load balancer rules on an IP associated with a network
instead of a vpc, the network field can be omitted and inferred from the
IP. Filling this into state on read causes a spurious diff.

The openfirewall flag defaults to true when used on a network IP.
Implicit resource creation doesn't fit the terraform model, so we
disable it.

Also added a test which shows arguments that can be changed without
creating a new resource.
2015-09-06 23:43:37 +01:00
Sander van Harmelen 06627ccf39 Merge pull request #3177 from glenjamin/cloudstack-acceptance
Make it easier to run the cloudstack acceptance tests
2015-09-06 21:13:16 +02:00
Glen Mailer eee86d58f8 Make it easier to run the cloudstack acceptance tests
* Document what should go in the environment variables
* Generate set hash for egress firewall based on selected public ip
2015-09-06 18:21:55 +01:00
Paul Hinze dcaf0f8b87 provider/aws: correct && -> || mistake
Thanks for the sanity check, @aparrentlymart and @dwradcliffe :)
2015-09-06 12:01:57 -05:00
Kazunori Kojima 47d2b29895 Use `%t` for boolean value 2015-09-06 11:06:29 +09:00
Kazunori Kojima 707fe3ac6d Changed to versioning block 2015-09-05 17:19:52 +09:00
Kazunori Kojima 0fbfd71f96 Allows S3 bucket versioning configuration 2015-09-05 11:38:56 +09:00
Paul Hinze 1dfad739bb provider/aws: tweak iam_instance_profile logic
- always `d.Set` to either the profile name or the empty string
 - add some conservative pointer checking to the helper method

/cc @dwradcliffe
2015-09-04 19:20:58 -05:00
Paul Hinze d937045afd Merge pull request #3167 from dwradcliffe/read_instance_role
provider/aws: read iam_instance_profile for instance and save to state
2015-09-04 19:15:24 -05:00
Paul Hinze 365a7a253a Merge pull request #2866 from berendt/gh_issue_2865
provider/openstack: add state 'downloading' to resource 'blockstorage_volume_v1'
2015-09-04 18:52:56 -05:00
Paul Hinze 0a64779ee5 Merge pull request #2412 from apparentlymart/rundeck
Rundeck Provider
2015-09-04 13:38:20 -05:00
Paul Hinze 5f3b6f9952 Merge pull request #3120 from apparentlymart/elasticache-subnet-names
aws_elasticache_subnet_group normalizes name to lowercase.
2015-09-04 13:21:06 -05:00
Paul Hinze 3abf4796d4 Merge pull request #2784 from apparentlymart/aws-images
AWS AMI resources
2015-09-04 13:16:44 -05:00
David Radcliffe 0b88177cf0 read iam_instance_profile and save to state 2015-09-03 15:43:41 -04:00
Paul Hinze eb150ae025 provider/aws: add ses_smtp_password to iam_access_key
AWS gives instructions for converting AWS credentials into SES SMTP
credentials here:

https://docs.aws.amazon.com/ses/latest/DeveloperGuide/smtp-credentials.html#smtp-credentials-convert

This implements their algorithm and yields the result as an attribute on
`iam_access_key`.
2015-09-03 13:01:04 -05:00
Martin Atkins 7f64327663 Three resources for AWS AMIs.
AWS provides three different ways to create AMIs that each have different
inputs, but once they are complete the same management operations apply.

Thus these three resources each have a different "Create" implementation
but then share the same "Read", "Update" and "Delete" implementations.
2015-09-03 10:05:41 -07:00
Martin Atkins 4ae3a17eab aws_elasticache_subnet_group normalizes name to lowercase.
The Elasticache API accepts a mixed-case subnet name on create, but
normalizes it to lowercase before storing it. When retrieving a subnet,
the name is treated as case-sensitive, so the lowercase version must be
used.

Given that case within subnet names is not significant, the new StateFunc
on the name attribute causes the state to reflect the lowercase version
that the API uses, and changes in case alone will not show as a diff.

Given that we must look up subnet names in lower case, we set the
instance id to be a lowercase version of the user's provided name. This
then allows a later Refresh call to succeed even if the user provided
a mixed-case name.

Previously users could work around this by just avoiding putting uppercase
letters in the name, but that is often inconvenient if e.g. the name is
being constructed from variables defined elsewhere that may already have
uppercase letters present.
2015-09-03 10:03:35 -07:00
Martin Atkins 40aafe4455 rundeck_job resource type. 2015-09-03 10:01:32 -07:00
Martin Atkins bb42821f74 rundeck_private_key resource type. 2015-09-03 10:01:32 -07:00
Martin Atkins aba9698cf8 rundeck_public_key resource type. 2015-09-03 10:01:32 -07:00
Martin Atkins f0947661fb rundeck_project resource type. 2015-09-03 10:01:32 -07:00
Martin Atkins a42be3e6cf New provider for Rundeck, a runbook automation system. 2015-09-03 10:01:32 -07:00
Radek Simko 5d215c42db provider/aws: Add acceptance test for aws_iam_saml_provider 2015-09-02 20:32:20 +01:00
Radek Simko 5001bb078e provider/aws: Add new resource - aws_iam_saml_provider 2015-09-02 19:57:29 +01:00
David Radcliffe 987ec967ea read source_dest_check and save to state 2015-09-02 14:04:45 -04:00
Lars Wander 3f4c451fe8 Brought metadata code up to spec with GCE API change 2015-08-31 14:43:45 -04:00
Dave Cunningham af5ae9b595 Merge pull request #3130 from hashicorp/b-gce-vet-fixes
provider/google: Misc. cleanups for tests to pass
2015-08-31 13:20:43 -04:00
Clint 03aba6f6a3 Merge pull request #2986 from tphummel/aws_kinesis_stream-shard_count
aws_kinesis_stream: shard_count state fix
2015-08-31 09:43:40 -05:00
Clint Shryock f174587291 provider/aws: touch up on aws_spot_instance 2015-08-31 09:34:34 -05:00
Clint 273d4fc98d Merge pull request #2954 from stayup-io/issue_2919_pass_extra_settings_to_aws_spot_request
Pass key_name and subnetId to spot instance request - resolves issue #2919
2015-08-31 09:33:30 -05:00
Clint Shryock 5d7e156982 provider/google: Misc. cleanups for tests to pass 2015-08-31 09:06:25 -05:00
Clint 81af6e18f8 Merge pull request #3043 from hashicorp/b-aws-paginate-asg-notifications
provider/aws: Paginate the notifications returned for ASG Notifications
2015-08-31 08:41:28 -05:00
Clint 64258c1efd Merge pull request #3053 from hashicorp/b-aws-db-updates
provider/aws: Updates for RDS
2015-08-28 10:26:11 -05:00
Radek Simko f4d7ec714e Merge pull request #3061 from TimeIncOSS/b-aws-ecs-iam-diff
Various ECS bugfixes (IAM, destroy timeout)
2015-08-25 16:22:51 +01:00
Clint Shryock fc0ccb957a provider/aws: Add update method to DB Subnet Group 2015-08-24 16:52:30 -05:00
Lars Wander 2aad1f7bd2 Implemented CRUD project metadata operations
Common metadata state is now stored

Optimistic locking support added to common_metadata

Revisions to keys in project metadata are now reflected in the project state

Wrote tests for project metadata (all pass)

Relaxed test conditions to work on projects with extra keys

Added documentation for project metadata
2015-08-24 12:53:28 -04:00
Clint Shryock bd2adfce3b update StateFunc to return empty string if maintenance_window not found 2015-08-24 11:25:43 -05:00
Clint Shryock 22e73d7b68 provider/aws: Lower case DB Instance's maintenance window
Fixes https://github.com/hashicorp/terraform/issues/2719
2015-08-24 11:08:19 -05:00
Christian Berendt b38f0e2f67 provider/openstack: add state 'downloading' to resource 'blockstorage_volume_v1'
When using an image as the source of new volume the state 'downloading'
prior to the state 'available' is fine.

It is also fine to destroy a volume in the state 'downloading'.

Closes-bug: #2865
Co-Authored-By: Joe Topjian <joe@topjian.net>
2015-08-24 08:21:35 +02:00
Radek Simko 00646b1d7b ecs_service: Remove unused code 2015-08-23 17:45:52 +01:00
Radek Simko 9c2a3e79f9 ecs_service: Add note about race condition w/ IAM policy
- fixes #2902
2015-08-23 17:45:24 +01:00
Radek Simko 669d196a58 ecs_service: Role name can be used in iam_role (ARN was supported)
- fixes #2722
2015-08-23 17:42:15 +01:00
Radek Simko fad019e950 ecs_service: Retry if IAM policy isn't ready yet
- fixes #2869
2015-08-23 17:37:29 +01:00
Clint Shryock d793c6dbff provider/aws: Updates for RDS 2015-08-21 16:58:34 -05:00
Clint Shryock ba945f2ff7 update with test 2015-08-21 10:51:16 -05:00
Sander van Harmelen 6b8d37e938 Fix issue #3033 and update tweak several cloudstack resources
- Added a retry loop for attaching disks as this something was tried to
fast when the VM was still booting
- Fix issue #3033
- Update docs for latest updates and done some minor refactoring
(styling)
2015-08-21 16:59:35 +02:00
Sander van Harmelen cb49c8da3d Merge pull request #2934 from jeroendekorte/master
provider/cloudstack: Added loadbalancer support to the provider
2015-08-21 11:16:04 +02:00
Sander van Harmelen 23c1dba7a3 Merge pull request #3035 from vmfarms/master
Add project parameter to more Cloudstack resources
2015-08-21 10:40:23 +02:00
Jeroen de Korte 2d1d47fac6 Added LoadBalancer support for Cloudstack Provider
PR is complete with docs and tests
2015-08-21 10:37:08 +02:00
Clint Shryock ae0fbae176 provider/aws: Paginate the notifications returned for ASG Notifications 2015-08-20 17:27:35 -05:00
Radek Simko 53499a9391 google: Add regression test for #2978 2015-08-20 21:40:57 +01:00
Radek Simko f27f64e8af Merge pull request #2978 from djworth/master
Convert int to int64 when building the cluster.NodeConfig struct
2015-08-20 21:34:54 +01:00
Hany Fahim 330673038c Add project parameter to cloudstack_disk 2015-08-20 13:35:11 -04:00
Hany Fahim 078b16b20e Add project parameter to cloudstack_ipaddress 2015-08-20 08:32:57 -04:00
Hany Fahim 228da7cf27 Add project parameter to VPC and network Cloudstack resources 2015-08-19 17:56:57 -04:00
Radek Simko f27b0a0cf1 Merge pull request #3000 from TimeIncOSS/code-formatting
Format code via gofmt + fix whitespacing
2015-08-19 10:45:11 +01:00
Dave Cunningham aa45266fdb Fix #2901 2015-08-19 02:57:04 -04:00
Clint Shryock fde2a400f7 Merge branch 'master' into f-aws-pr-2779
* master: (84 commits)
  provider/aws: Update to aws-sdk 0.9.0 rc1
  use name instead of id  - launch configs use the name and not ID
  Fix typo on heroku_cert example
  provider/aws: add value into ELB name validation message
  tests: fix missed test update from last merge
  update prevent_destroy error message
  Update CHANGELOG.md
  Update CHANGELOG.md
  providers/aws: Update Launch Config. docs to detail naming and lifecycle recommendation
  release: cleanup after v0.6.3
  v0.6.3
  Update CHANGELOG.md
  core: fix deadlock when dependable node replaced with non-dependable one
  tests: extract deadlock checking test helper
  core: log every 5s while waiting for dependencies
  Fixed indentation in a code sample
  state/remote/s3: match with upstream changes
  provider/aws: match with upstream changes
  google: Add example of two-tier app
  Updating Launch Config Docs for Name attribute
  ...
2015-08-18 14:40:01 -05:00
Dave McDermid 1a85f1344b Added join_domain feature to Azure Instance resource 2015-08-18 16:09:34 +01:00
Clint Shryock 0c2f189d08 provider/aws: Update to aws-sdk 0.9.0 rc1 2015-08-17 13:27:16 -05:00
Sargurunathan Mohan 9abd74819e apply go fmt on config.go 2015-08-16 17:13:23 -07:00
Tom Hummel b68c23fb42 aws_kinesis_stream: remove limit on DescribeStream
using limit: 1 on DescribeStream will always return 1 shard no matter how many shards there actually are when we call `len()`. so i've removed the limit parameter to get the actual shard list returned

remove limits
2015-08-14 22:24:02 -07:00
Radek Simko 00ad41bf7d google: Code formatted via gofmt 2015-08-14 12:06:06 +01:00
Sargurunathan Mohan b95e7a976c fail silently when users have forbiddenaccount/allowedaccount configured while authenticating via iam profile instance 2015-08-14 03:52:38 -07:00
Paul Hinze 55411d692d provider/aws: add value into ELB name validation message
makes debugging these validation errors much more straightforward
2015-08-13 16:31:18 -05:00
djworth 75c1475cc1 Convert int to int64 when building the cluster.NodeConfig struct
related to issue https://github.com/hashicorp/terraform/issues/2901
2015-08-11 08:27:32 -04:00
Paul Hinze ca993a5a5e provider/aws: match with upstream changes 2015-08-10 15:39:47 -05:00
Clint Shryock eb90457223 guard on both accessdenied (no IAM policy) and validationerror (no username specified) 2015-08-07 11:55:44 -05:00
Clint Shryock 31fab62bfd provider/aws: Fail silently in ValidateCredentials for IAM users 2015-08-07 11:40:50 -05:00
David Laing 79d8fde09c Pass key_name and subnetId to spot instance request 2015-08-06 20:22:10 +01:00
Clint Shryock c1daf23a5d provider/aws: Fix issues with TestAccAWSPolicyAttachment_basic 2015-08-06 09:47:35 -05:00
Clint Shryock a1a78bd482 provider/aws: Add ARN to Dynamo schema 2015-08-05 14:43:26 -05:00
Clint b779144a1e Merge pull request #2924 from calvinfo/f-aws-dynamo-arn
provider/aws: Add arn attribute for DynamoDB tables
2015-08-05 14:42:20 -05:00
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 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
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 Shryock 8d5fe93152 conditionally set InstanceInitiatedShutdownBehavior 2015-08-04 06:09:47 -05: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 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
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
Clint Shryock 44f470514c provider/aws: Add S3 Bucket Object (supercedes #2079) 2015-07-30 15:17:37 -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
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 26b416335f Merge pull request #2861 from hashicorp/b-azure-instance-error
provider/azure: Provide a simpler error when using a Platform Image without a Storage Service
2015-07-30 09:28:33 -05:00
Clint Shryock 488587467c code formatting 2015-07-30 09:27:13 -05: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
Justin Campbell 7884456c4b providers/google: Fix reading account_file path 2015-07-29 15:59:33 -04:00
Justin Campbell 4764a556c0 providers/google: Fix error appending 2015-07-29 15:59:33 -04:00
Clint Shryock 8faa111156 providers/google: Return if we could parse JSON 2015-07-29 15:59:32 -04:00
Justin Campbell 773852e2d5 providers/google: Change account_file to JSON
If JSON fails to parse, treat it as a file path
2015-07-29 15:59:32 -04:00
Justin Campbell 2a04708d66 providers/google: Default account_file* to empty
Prevents prompting for input
2015-07-29 15:59:32 -04:00
Justin Campbell a7ca7e0b36 providers/google: Add account_file/account_file_contents ConflictsWith 2015-07-29 15:59:32 -04:00