Commit Graph

6971 Commits

Author SHA1 Message Date
stack72 82293bf59e
Merge branch 'master' of github.com:hashicorp/terraform 2017-04-21 12:52:22 +03:00
stack72 1913d72212
Merge branch 'olakar_g-network-import' of https://github.com/skalle/terraform into skalle-olakar_g-network-import 2017-04-21 12:41:09 +03:00
Pasha Palangpour 2a7b0e7e36 provider/ns1: record documentation improvements (#13786)
* provider/ns1: Adds acctest for SRV type records

* ns1/provider: Adds dns record examples to documentation.
2017-04-21 12:38:05 +03:00
Devin Lundberg 081121d29b Fix invalid MIME formatting in multipart cloudinit userdata (#13752)
* Fix invalid MIME formatting in multipart cloudinit userdata 

Per https://tools.ietf.org/html/rfc822#appendix-B.2, MIME headers and Body need to be separated by two new lines (or CRLFs in this case). 

The email parser in python can handle this which is what cloud-init uses but this bug causes problems if you try to parse the multipart message by languages other than python.

* Fix test cases
2017-04-21 08:30:09 +02:00
Ola Karlsson 3af9aa283d Adding Import to the Google network resource 2017-04-21 01:58:22 +00:00
Joshua Spence f3b5a883b7 Add `bucket_prefix` to `aws_s3_bucket` (#13274)
Adds a `bucket_prefix` parameter to the `aws_s3_bucket` resource.
2017-04-20 23:28:40 +03:00
Jon Oden d5207e17ed Add ability to associate healthcheck to a backend (#13539) 2017-04-20 23:24:19 +03:00
Paddy 600a117301 Merge pull request #13671 from JDiPierro/google_address_name_fix
provider/google: Set name field when reading addresses
2017-04-20 13:14:57 -07:00
Dominik-K 565f0a4e0f `roles` deprecated in docs & code error message (#13622) 2017-04-20 23:02:48 +03:00
Chris Broglie 3f0934bd4e provider/aws: Add aws_kinesis_stream data source (#13562)
This fixes #13521
2017-04-20 22:13:39 +03:00
Jake Champlin 35388cbc31 Merge pull request #13468 from hashicorp/f-oracle-compute
provider/opc: Add Oracle Compute Provider
2017-04-20 14:52:39 -04:00
Paul Stack 195ad5ef02 provider/logentries: Refresh from state when resources not found (#13810)
Fixes: #13805

Before the fix:

```
Error refreshing state: 1 error(s) occurred:

* logentries_logset.logset: logentries_logset.logset: No such log set with key 278e7344-1201-43ba-9804-77b9a72fe7d6
```

After the fix:

```
% terraform plan                                                                                  ✚ ✭
[WARN] /Users/stacko/Code/go/bin/terraform-provider-logentries overrides an internal plugin for logentries-provider.
  If you did not expect to see this message you will need to remove the old plugin.
  See https://www.terraform.io/docs/internals/internal-plugins.html
Refreshing Terraform state in-memory prior to plan...
The refreshed state will be used to calculate this plan, but will not be
persisted to local or remote state storage.

logentries_logset.logset: Refreshing state... (ID: 278e7344-...a72fe7d6)
logentries_log.log: Refreshing state... (ID: 2ae1e8ae-...e932d25c)
The Terraform execution plan has been generated and is shown below.
Resources are shown in alphabetical order for quick scanning. Green resources
will be created (or destroyed and then created if an existing resource
exists), yellow resources are being changed in-place, and red resources
will be destroyed. Cyan entries are data sources to be read.

Note: You didn't specify an "-out" parameter to save this plan, so when
"apply" is called, Terraform can't guarantee this is what will execute.

+ logentries_log.log
    logset_id:        "${logentries_logset.logset.id}"
    name:             "test-log"
    retention_period: "ACCOUNT_DEFAULT"
    source:           "token"
    token:            "<computed>"

+ logentries_logset.logset
    location: "nonlocation"
    name:     "testing-terraform-destroy"

Plan: 2 to add, 0 to change, 0 to destroy.
```

Test Run:

```
% make testacc TEST=./builtin/providers/logentries                                                ✚ ✭
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/20 20:36:20 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/logentries -v  -timeout 120m
=== RUN   TestProvider
--- PASS: TestProvider (0.00s)
=== RUN   TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN   TestAccLogentriesLog_Token
--- PASS: TestAccLogentriesLog_Token (39.03s)
=== RUN   TestAccLogentriesLog_SourceApi
--- PASS: TestAccLogentriesLog_SourceApi (28.46s)
=== RUN   TestAccLogentriesLog_SourceAgent
--- PASS: TestAccLogentriesLog_SourceAgent (6.19s)
=== RUN   TestAccLogentriesLog_RetentionPeriod1M
--- PASS: TestAccLogentriesLog_RetentionPeriod1M (3.04s)
=== RUN   TestAccLogentriesLog_RetentionPeriodAccountDefault
--- PASS: TestAccLogentriesLog_RetentionPeriodAccountDefault (2.71s)
=== RUN   TestAccLogentriesLog_RetentionPeriodAccountUnlimited
--- PASS: TestAccLogentriesLog_RetentionPeriodAccountUnlimited (2.65s)
=== RUN   TestAccLogentriesLogSet_Basic
--- PASS: TestAccLogentriesLogSet_Basic (1.54s)
=== RUN   TestAccLogentriesLogSet_NoLocation
--- PASS: TestAccLogentriesLogSet_NoLocation (1.54s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/logentries	85.177s
```
2017-04-20 21:38:37 +03:00
Andy Lindeman 28d71e6624 provider/github: Implements github_branch_protection (#10476) 2017-04-20 21:11:49 +03:00
Joe Topjian 6262a73de7 provider/rabbitmq: Allow users without tags (#13798)
This commit makes the tags attribute optional for users. It also
handles cases when a user defines a tag as an empty string ("").
2017-04-20 20:10:20 +03:00
Alexander 9bd50a1219 provider/google: BigQuery Dataset (#13436)
* Vendor BigQuery

* Add resource

* Add tests

* Add documentation

* Remove named import

* Remove `retain_on_delete`

* Fix formatting
2017-04-20 09:47:38 -07:00
Tom Harvey 6e698fd5fe Merge pull request #13755 from StephenWeatherford/11625c
Fix another issue from #11625 that's causing null entries in ssh_keys
2017-04-20 14:01:31 +01:00
Tom Harvey 1775d48381 Merge pull request #13791 from whiskeyjay/subnetRTFix
provider/azurerm: Locking route table on subnet create/delete
2017-04-20 12:39:59 +01:00
tombuildsstuff 8706d2181f Fixing the import test by adding missing formatting values 2017-04-20 12:28:33 +01:00
Daniel Kats 8a70108612 fix a word in aws_iam_role_policy error msg (#13794) 2017-04-20 06:48:58 +01:00
clint shryock 7f3c8e4765 move this test to new region 2017-04-19 17:20:44 -05:00
Joseph Anthony Pasquale Holsten c57e0735d1 Merge pull request #13745 from bhood4/master
provider/ultradns: add ultradns_rdpool resource
2017-04-19 10:45:20 -07:00
Christoph Blecker 596f05b881 Fix govet errors (#13774) 2017-04-19 20:21:31 +03:00
Jay Wang c42b2381c6 Added check for empty strings in resource id parsing logic. 2017-04-18 17:17:14 -07:00
Stephen Weatherford 1320347b7b Fix another issue from #11625 that's causing null entries in ssh_keys 2017-04-18 21:38:03 +00:00
Jay Wang f712880fee Lock Route Table / Subnets 2017-04-18 14:18:30 -07:00
Joseph Herlant 507917df43 provider/fastly: upgrade go-fastly to fix #12910 (#13648)
* Adding acceptance tests to reproduce issue #12910

* Upgrade go-fastly and its dependencies and move the Version to int as changed upstream
2017-04-18 13:30:54 -05:00
Tom Harvey 502a744a65 Merge pull request #13637 from hashicorp/azurerm-lock-bugfix
provider/azurerm: Locking around Network Security Group / Subnets
2017-04-18 17:34:04 +01:00
tombuildsstuff 079043d5f8 Checking the type of the subnet before using it 2017-04-18 16:38:36 +01:00
tombuildsstuff fd03d0310e Formatting 2017-04-18 16:12:22 +01:00
tombuildsstuff 3ecb0f4fc4 Locking on the NSG ID 2017-04-18 16:12:22 +01:00
tombuildsstuff b93e6e3af7 Locking on the delete too 2017-04-18 16:12:22 +01:00
tombuildsstuff b6866f2187 Locking the NSG to only operate on one resource at a time in the create 2017-04-18 16:12:22 +01:00
ebilhoo 37810872a0 resourceUltradnsRdpoolRead set rdata 2017-04-18 15:08:18 +00:00
ebilhoo 04553c5d4e add rdpool 2017-04-18 15:08:18 +00:00
ebilhoo 801e7b70e6 support for rdpool resource 2017-04-18 15:08:18 +00:00
Radek Simko 1b841e77de provider/aws: Run all AWSConfig acc tests sequentially (#13658) 2017-04-18 17:59:44 +03:00
Jake Champlin 5b0ea5abff Merge pull request #13715 from hashicorp/b-update-spot-datafeed-test
provider/aws: Run AWS Spot Datafeed Subscription tests in serial
2017-04-18 10:46:26 -04:00
KOJIMA Kazunori 47d255f943 provider/aws: Add aws_kms_alias datasource (#13669) 2017-04-18 15:29:14 +03:00
demonwy 69ec7e12ac provider/alicloud: Add new resource ESS, including scalinggroup scalingconfiguration scalingrule and schedule (#13731)
* add docs

* add new resource ess

* add examples

* update aliyun go

* merge master

* fix ci
2017-04-18 15:18:57 +03:00
Julien Pivotto c2d1a37334 DigitalOcean: Export droplet prices (#13720)
Note: In DO, Droplets are about the only thing you pay. DNS/Float IP are
free.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2017-04-18 14:52:40 +03:00
clint shryock 8939ac2256 provider/aws: randomize some more test 2017-04-17 16:02:01 -05:00
clint shryock a6565555cb provider/aws: Update Lambda tests for randomness 2017-04-17 15:18:19 -05:00
Martin Atkins b21bb7746a Merge #11776: Optionally allow vault_generic_secret resource to detect drift 2017-04-17 11:14:02 -07:00
Martin Atkins d515c2efc4 Merge #12757: local_file resource 2017-04-17 10:48:15 -07:00
Jake Champlin 20b0d9f060
provider/aws: Run AWS Spot Datafeed Subscription tests in serial 2017-04-17 11:35:56 -04:00
= 6f9570b114 Fixes TestAccAWSAutoscalingLifecycleHook_omitDefaultResult 2017-04-17 09:12:42 -06:00
Paul Stack b3cc7ea4cf provider/aws: Add support for aws_dms_replication_task available states (#13697) 2017-04-17 16:00:41 +03:00
Paul Hinze 193c0d80ad
provider/aws: Validate GovCloud KMS ARNs
Fixes validation errors in GovCloud when passing a KMS ARN for
`kms_key_id` in `s3_bucket_object` and `db_instance`.

The region is `us-gov-west-1` which breaks the regexp. Just added the
optional `gov-` in the right place.
2017-04-16 22:35:09 -07:00
Paul Tyng b8b896e11b Update go-newrelic vendor and use new field (#13158)
Fixes #12972
2017-04-17 01:59:11 +03:00
Kent Wang 8927ad5dce provider/alicloud: Fix allocate public ip error (#13267) (#13268)
Wait for instance to be in STOPPED or RUNNING state before invoking
AllocatePublicIP API.

* provider/alicloud: Wait for instance state before allocate public ip

* provider/alicloud: Fix test `TestAccAlicloudInstance_associatePublicIP`

* provider/alicloud: Update alicloud_instance document

Fixes: #13267
2017-04-17 01:52:39 +03:00