Commit Graph

18358 Commits

Author SHA1 Message Date
Scott Nowicki 372605c5bb added env variables to terraform:light 2017-04-20 13:52:15 -05:00
Scott Nowicki 3a1adfc3e1 simplified travis.yml and deploy.sh 2017-04-20 13:44:23 -05:00
Paul Stack 164a5968ee Update CHANGELOG.md 2017-04-20 21:39:29 +03: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
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
Scott Nowicki 60b20817b4 service docker required, despite docker already running 2017-04-20 12:52:12 -05:00
Scott Nowicki 8ed7e81255 invalid path for travis 2017-04-20 12:49:23 -05:00
Scott Nowicki 017b469ee6 mount pwd to container for terraform 2017-04-20 12:46:43 -05:00
Scott Nowicki 3f9d6a2111 no need to pull images 2017-04-20 12:38:00 -05:00
Scott Nowicki 602559f3f7 updated travis file to use docker for pre_deploy/deploy/after_deploy 2017-04-20 12:34:32 -05: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
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
Scott Nowicki f117f1de26 trying terraform 0.9.2 for destroy bug; fixed interpolation issue with sshCommand 2017-04-20 00:43:32 -05:00
Scott Nowicki 87b049b72d adding cd to after_deploy to ensure we're in the correct directory 2017-04-19 23:26:28 -05:00
Scott Nowicki 36e4b74c13 added -force to after_deploy 2017-04-19 20:32:22 -05:00
Scott Nowicki bf5d9773e2 fixed after_deploy syntax for .travis.yml 2017-04-19 20:23:07 -05:00
Scott Nowicki 1653d5da73 incorrect variable reference 2017-04-19 19:52:02 -05:00
Scott Nowicki af3de7b7df azure is awfully particular for certain strings 2017-04-19 19:36:16 -05:00
Scott Nowicki e0208f48ba added after_deploy step to travis.yml; updated string generation yet again 2017-04-19 19:29:36 -05:00
Scott Nowicki 4fb55b0c5e made string generation more robust 2017-04-19 19:19:15 -05:00
Scott Nowicki acaea87c93 nixed the numbers from string generation 2017-04-19 19:02:39 -05:00
Scott Nowicki 1d7d3f1b45 added missing \ to plan command 2017-04-19 18:56:12 -05:00
Scott Nowicki f52b7a9d85 fixed -out syntax 2017-04-19 18:44:55 -05:00
Scott Nowicki 42b4ddc737 plan now produces output plan, apply now consumes outputted plan 2017-04-19 18:41:38 -05:00
Scott Nowicki 44d416ca8e fixed quotes 2017-04-19 18:34:44 -05:00
Scott Nowicki 3dce8c2c78 was working on the wrong deploy.sh........ :( 2017-04-19 18:28:42 -05:00
Scott Nowicki d0973b77c1 moved outputs to outputs.tf; added sshCommand 2017-04-19 18:20:56 -05:00
Scott Nowicki 048ab5a774 renamed folder; updated deployment script; prompt for additional variables 2017-04-19 17:59:56 -05: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
Scott Nowicki c4ac9c3dbb fixed syntax for terraform variables 2017-04-19 16:38:18 -05: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
Mary Elizabeth Cutrali 3d315baee5 update spelling of Bitbucket 2017-04-19 17:30:58 -04:00