Commit Graph

8821 Commits

Author SHA1 Message Date
stack72 e6e18a4a9e provider/aws: Change Redshift Cluster cluster_type to be computed
It will be based off the number of nodes. Can only be multi-node (>1
node) or single-node (nodes=1)
2016-02-21 19:42:02 +00:00
James Nugent 938ab99d51 Merge pull request #5227 from hashicorp/f-test-cover-eval-ignore-changes
core: Test fix for mismatched diffs from GH-4965
2016-02-20 14:18:22 -05:00
James Nugent c91b648c15 core: Test fix for mismatched diffs from GH-4965
This test presents itself in an awkward manner as part of the AWS test
suite rather than the core test suite - this is because you cannot use
real providers in context tests because of circular references, and
simplistic test providers in that package do not demonstrate the issue.
In the interests of getting this fix in quickly and still having
regression coverage for it, it was agreed to include the change here
instead.

Running the test TestAccAWSVPC_coreMismatchedDiffs without the changes
in d95ab75 applied leads to the following output:

```
$ make testacc TEST=./builtin/providers/aws TESTARGS="-run TestAccAWSVPC_coreMismatchedDiffs"
==> Checking that code complies with gofmt requirements...
/Users/James/Code/go/bin/stringer
GO15VENDOREXPERIMENT=1 go generate $(GO15VENDOREXPERIMENT=1 go list ./... | grep -v /vendor/)
TF_ACC=1 GO15VENDOREXPERIMENT=1 go test ./builtin/providers/aws -v -run TestAccAWSVPC_coreMismatchedDiffs -timeout 120m
=== RUN   TestAccAWSVPC_coreMismatchedDiffs
--- FAIL: TestAccAWSVPC_coreMismatchedDiffs (2.26s)
	testing.go:148: Step 0 error: Error applying: 1 error(s) occurred:

		* aws_vpc.test: diffs didn't match during apply. This is a bug with Terraform and should be reported.
FAIL
exit status 1
FAIL	github.com/hashicorp/terraform/builtin/providers/aws	2.281s
make: *** [testacc] Error 1
```

Applying the changes in d95ab75 (pull request GH-4965) yields the
following result when running the test:

```
$ make testacc TEST=./builtin/providers/aws TESTARGS="-run TestAccAWSVPC_coreMismatchedDiffs"
==> Checking that code complies with gofmt requirements...
/Users/James/Code/go/bin/stringer
GO15VENDOREXPERIMENT=1 go generate $(GO15VENDOREXPERIMENT=1 go list ./... | grep -v /vendor/)
TF_ACC=1 GO15VENDOREXPERIMENT=1 go test ./builtin/providers/aws -v -run TestAccAWSVPC_coreMismatchedDiffs -timeout 120m
=== RUN   TestAccAWSVPC_coreMismatchedDiffs
--- PASS: TestAccAWSVPC_coreMismatchedDiffs (15.17s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	15.183s
```

The test has a rather misleading name ("AWS") such that it is actually run as
part of the nightly acceptance testing. The VPC resource is quick and free to
create, hence the selection.
2016-02-19 21:24:49 -05:00
Paul Hinze 92dc20bb35 Merge pull request #5214 from hashicorp/phinze/doc-file-path-info
website: clarify `file()` base location
2016-02-19 12:14:35 -06:00
Paul Hinze a7b8a54a83 website: clarify `file()` base location
refs #5213
2016-02-19 09:56:55 -06:00
Joe Topjian c284f43a0b Update CHANGELOG.md 2016-02-18 20:28:00 -07:00
Joe Topjian a230213b33 Merge pull request #5106 from kars7e/master
Add optional cacert_file parameter to openstack provider
2016-02-18 20:26:44 -07:00
Paul Stack 27d82a2397 Merge pull request #5204 from hashicorp/f-riviera-resource-groups
provider/azurerm: Use Riviera for Resource Groups
2016-02-19 00:04:44 +00:00
James Nugent d51bdd1772 provider/azurerm: Use Riviera for Resource Groups 2016-02-18 14:50:43 -08:00
James Nugent 803ef52c8c Update CHANGELOG.md 2016-02-18 14:47:39 -08:00
Brett Mack 04d7532bf7 When creating a new VApp wait for the VM to be given an IP address if using DHCP 2016-02-18 14:44:18 -08:00
James Nugent 0d9a7a65ef Merge pull request #5177 from hashicorp/f-go-1.6
Update Travis to use Go 1.6
2016-02-18 10:01:49 -08:00
James Nugent 4956b1a3e9 provider/chef: Fix go vet issues
This is rather hacky but it should get rid of our last remaining go vet
warning. This appears to be golang/go#9171, which was closed as
"Unfortunate"
2016-02-18 09:42:00 -08:00
James Nugent a040110c0f Gix gofmt errors 2016-02-18 08:51:27 -08:00
James Nugent fe52b43dbe Update CHANGELOG.md 2016-02-18 08:48:36 -08:00
James Nugent b32a863ed3 provider/google: Clarify comment about defaults 2016-02-18 08:37:58 -08:00
James Nugent b77bcd64fd Remove TODO comment 2016-02-18 08:37:58 -08:00
James Nugent 31f47e5abf Correct format specifier 2016-02-18 08:37:58 -08:00
Matt Morrison f66f37f4d8 Add more acceptance tests, and fix some test cases 2016-02-18 08:37:58 -08:00
Matt Morrison d6039af398 Add subnetwork resource ACC tests, additional doc updates 2016-02-18 08:37:58 -08:00
Matt Morrison 430ed48a44 Update google resources where necessary to make use of subnetworks, update som docs 2016-02-18 08:37:58 -08:00
Matt Morrison aedc5ba4af [WIP] support for creating distributed networks, and subnetwork resources 2016-02-18 08:37:57 -08:00
Clint 396dc303ac Merge pull request #5187 from hashicorp/sort-aws-key-pair
website: Sort aws_key_pair in the sidebar
2016-02-18 08:35:49 -06:00
Justin Campbell b78f1b6670 website: Sort aws_key_pair in the sidebar 2016-02-18 09:22:14 -05:00
James Nugent 904c5ae576 Update Travis to use Go 1.6 2016-02-17 14:29:53 -08:00
James Nugent 28eff5bcf9 Merge pull request #5176 from hashicorp/update-cleanhttp
Update go-cleanhttp
2016-02-17 14:26:43 -08:00
Jeff Mitchell 88ca0ec5df Update go-cleanhttp 2016-02-17 17:25:24 -05:00
James Nugent a22a2e1ddf Update CHANGELOG.md 2016-02-17 13:57:11 -08:00
James Nugent 815cde7fd2 Merge pull request #5125 from lwander/b-gcp-vpn-gateway-region
provider/google: Fix VPN Region bug
2016-02-17 13:45:32 -08:00
James Nugent 84d9b757d1 Merge pull request #5173 from tpounds/go-vet-on-travis-ci-builds
Enable `go vet` on Travis CI builds
2016-02-17 13:43:55 -08:00
Trevor Pounds fdf9a35490 Run `go vet` taget on Travis CI builds. 2016-02-17 13:37:56 -08:00
James Nugent 1e876e3530 Update CHANGELOG.md 2016-02-17 13:36:17 -08:00
Trevor Pounds ebe5346e8f Enable all `go vet` warnings. 2016-02-17 13:29:51 -08:00
James Nugent f7504f7f9f Merge branch 'master' of https://github.com/vincer/terraform into vincer-master 2016-02-17 13:16:16 -08:00
James Nugent 21c8814390 Merge pull request #5172 from hashicorp/tpounds-fix-go-vet-warnings
Fix go vet warnings
2016-02-17 13:12:52 -08:00
James Nugent 3708522913 Vendor mitchellh/hashstructure 2016-02-17 12:02:14 -08:00
James Nugent bc6107508d Fix additional vet warnings 2016-02-17 11:59:50 -08:00
Trevor Pounds bac909fdbf Fix `go vet -unreachable` warnings. 2016-02-17 11:59:50 -08:00
Trevor Pounds 3eb65f2cbb Enable `go vet -unusedresult` check and fix warnings. 2016-02-17 11:59:50 -08:00
Trevor Pounds 79742fc367 Enable `go vet -composites` check and fix warnings. 2016-02-17 11:59:50 -08:00
Trevor Pounds e130b2c2dc Fix `go vet` printf verb warnings.
e.g. arg trail.LogFileValidationEnabled for printf verb %t of wrong type: *bool
2016-02-17 11:59:50 -08:00
Trevor Pounds 8e6d11fc5e Do not `go vet` vendor dependencies. 2016-02-17 11:59:49 -08:00
James Nugent 34b7665af0 Merge branch 'update_link_ldflags' of https://github.com/pauloconnor/terraform into pauloconnor-update_link_ldflags 2016-02-17 10:07:59 -08:00
Paul O'Connor e3c6c05395 Put the equals in the correct place 2016-02-17 17:44:38 +01:00
Clint 1ba59994e8 Merge pull request #5124 from steve-jansen/patch-2
Link aws_ami_copy documentation to aws_ami
2016-02-17 10:40:32 -06:00
Martin Atkins a1e3020462 Merge pull request #5167 from jzohrab/add_terraform_get_hint
Add hint to download modules for new users.
2016-02-17 08:39:37 -08:00
Paul O'Connor 21f15aea3f Use new link ldflags syntax 2016-02-17 17:35:04 +01:00
Jeff Zohrab 33d30761dd Add hint to download modules for new users. 2016-02-17 11:32:44 -05:00
James Nugent 55726036e3 Merge pull request #5166 from stack72/f-azurerm-docs-nic
provider/azurerm: Documentation update for `azurerm_network_interface`
2016-02-17 08:19:02 -08:00
Clint 34412bf56c Update CHANGELOG.md 2016-02-17 10:03:23 -06:00