Commit Graph

18519 Commits

Author SHA1 Message Date
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
Paul Stack e4af2a67aa Update CHANGELOG.md 2017-04-20 21:12:34 +03:00
Andy Lindeman 28d71e6624 provider/github: Implements github_branch_protection (#10476) 2017-04-20 21:11:49 +03:00
terraformbot 7925b76bad provider/aws: Change s3_bucket documentation example to work (#13811)
Fixes: #13789
2017-04-20 21:00:05 +03:00
Paul Stack 7f4a371f2c Update CHANGELOG.md 2017-04-20 20:12:59 +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
Dana Hoffman 1157967fbe Update CHANGELOG.md 2017-04-20 09:49:14 -07: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
Jearvon Dharrie e667411cc5 website: Fix spacing of literal "terraform console" (#13807) 2017-04-20 09:36:34 -07:00
Chris Marchesi 744727a28a core: Trap warnings as well as errors on resourceNestedCount test 2017-04-20 07:31:44 -07:00
Tom Harvey 72f2a31298 Including #13755 in the changelog 2017-04-20 14:05:19 +01: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 30b6d695a6 Updating to include #13791 2017-04-20 12:41:07 +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
dj80hd 99a73094f7 Fix typo in aws-two-tier example (#13790) 2017-04-20 06:47:44 +01:00
Chris Marchesi d41b806789 core: Restore CountBoundaryTransformer to apply, add/adjust tests
Moving the transformer wholesale looks like it broke some tests, with
some actually doing legit work in normalizing singular resources from a
foo.0 notation to just foo.

Adjusted the TestPlanGraphBuilder to account for the extra
meta.count-boundary nodes in the graph output now, as well as added
another context test that tests this case. It appears the issue happens
during validate, as this is where the state can be altered to a broken
state if things are not properly transformed in the plan graph.
2017-04-19 22:23:52 -07:00
Chris Marchesi 2802d319d2 core: Move CountBoundaryTransformer to the plan graph builder
This fixes interpolation issues on grandchild data sources that have
multiple instances (ie: counts). For example, baz depends on bar, which
depends on foo.

In this instance, after an initial TF run is done and state is saved,
the next refresh/plan is not properly transformed, and instead of the
graph/state coming through as data.x.bar.0, it comes through as
data.x.bar.  This breaks interpolations that rely on splat operators -
ie: data.x.bar.*.out.
2017-04-19 16:56:54 -07:00
James Bardin f5cda342f7 Merge pull request #13778 from hashicorp/jbardin/GH-13617
improve resource.WaitForState and add refreshGracePeriod
2017-04-19 18:23:00 -04:00
clint shryock 7f3c8e4765 move this test to new region 2017-04-19 17:20:44 -05:00
James Bardin 4c3a053f0c lint errors 2017-04-19 18:19:48 -04:00
James Bardin 14bea66f4e add test for proper cancelation 2017-04-19 18:07:00 -04:00
James Bardin eb4b45941c fix tests affected by refreshGracePeriod
A couple tests require lowering the grace period to keep the test from
taking the full 30s timeout.

The Retry_hang test also needed to be removed from the Parallel group,
becuase it modifies the global refreshGracePeriod variable.
2017-04-19 18:07:00 -04:00
James Bardin af1628eaa4 add refreshGracePeriod
Refresh calls may have side effects that need to be recorded if it
succeeds, especially common when when WaitForState is called from
resource.Retry.

If the WaitForState timeout is reached and there is a Refresh call
in-flight, wait up to refreshGracePeriod (set to 30s) for it to
complete.
2017-04-19 18:07:00 -04:00
Martin Atkins d157eea2e3 website: Correct capitalization of "Bitbucket"
Previously we fixed this specifically for the Enterprise VCS integration,
but we also had some long-running errors of this sort in the docs for
how to specify module sources on Bitbucket.
2017-04-19 14:56:11 -07:00
Seth Vargo 3fa3ce60fa Merge pull request #13788 from hashicorp/docs-update-bitbucket-branding
Change BitBucket to Bitbucket
2017-04-19 17:35:59 -04:00
Jake Champlin fe8029e65e
initial attempt 2017-04-19 17:30:58 -04:00
Mary Elizabeth Cutrali 3d315baee5 update spelling of Bitbucket 2017-04-19 17:30:58 -04:00
Matthew Frahry 07c0f95563 Merge pull request #13772 from hashicorp/p-aws-multi-zone-instance
Fixing TestAccAWSInstance_multipleRegions
2017-04-19 14:32:43 -06:00
= 1608f5544f Added error check 2017-04-19 14:22:35 -06:00
ebilhoo 0cf9dbcfb4 Merge branch 'master' of https://github.com/bhood4/terraform 2017-04-19 20:03:59 +00:00
ebilhoo 8ef010440e cleanup and validation, rdpool.order optional with ROUND_ROBIN default 2017-04-19 20:02:27 +00:00
ebilhoo 65d364d805 cleanup and validation, rdpool.order optional with ROUND_ROBIN default 2017-04-19 19:54:42 +00:00
Paul Stack f5df4422ae provider/aws: Bump AWS SDK to 1.8.13 (#13775) 2017-04-19 20:55:37 +03: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
Jake Champlin 9893abe95d Update CHANGELOG.md 2017-04-19 13:27:33 -04:00
Jake Champlin 53ff003826 Merge pull request #13767 from hashicorp/f-bump-autorest-dep
core: Bump AutoRest Dep
2017-04-19 13:26:07 -04:00
Gauthier Wallet 3c6287cf3c Vendored AWS CognitoIdentity Service (#13771) 2017-04-19 20:22:36 +03:00
Christoph Blecker 596f05b881 Fix govet errors (#13774) 2017-04-19 20:21:31 +03:00
Yamamoto 03b82191bf `roles` deprecated in examples (#13769) 2017-04-19 20:20:02 +03:00
Martin Atkins cfa31b57a3 Update CHANGELOG.md 2017-04-19 09:42:42 -07:00
tmshn 86d7c47c0a Change cidrhost() to get IP from end of the range when negative number given
Ref: https://github.com/apparentlymart/go-cidr/pull/2
2017-04-19 09:41:41 -07:00
= 6bc3610c09 removing extraneous code 2017-04-19 09:18:30 -06:00
Jake Champlin 3bf354b16b
bump go-oracle-compute vendor 2017-04-19 10:59:52 -04:00
James Bardin 6601b9b8dd adjust the inconsistent_negative test to match
This test unfortunately relies on the timing of the loops in
WaitForState, and the text of the error message. Adjust the timing so
the timeout isn't an even multiple of the poll interval, and make sure
we reach a minimum number of retries.
2017-04-19 10:53:06 -04:00
James Bardin af5e22cf94 don't leave WaitForState goroutine running
Make sure that we can cancel the WaitForState refresh loop when reaching
a timeout, otherwise it may run indefinitely. There's no need to try and
store and read the Result concurrently, just pass the value over a
channel.
2017-04-19 10:41:51 -04:00
Jake Champlin 6c13f367ed
core: Bump AutoRest Dep
Bumps autorest dependency for Azure providers.

Fixes: #11131
2017-04-19 09:45:09 -04: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