Commit Graph

8864 Commits

Author SHA1 Message Date
Paul Hinze b9cbbe85e7 Merge pull request #5248 from freeformz/godep_fixup
Fix up deps
2016-02-22 14:50:36 -06:00
James Nugent e70516a286 Update CHANGELOG.md 2016-02-22 14:01:30 -05:00
Edward Muller c7376e5b39 Update google.golang.org/api/...
This release contains the Subnetwork stuff
2016-02-22 10:56:32 -08:00
James Nugent be20d0166a Merge branch 'master' of https://github.com/alkersan/terraform into alkersan-master 2016-02-22 13:54:24 -05:00
James Nugent 8b43577689 Update CHANGELOG.md 2016-02-22 13:53:46 -05:00
James Nugent 8e4691d895 Merge pull request #5203 from hashicorp/f-azurerm-search-service
provider/azurerm: Add Search Service resource
2016-02-22 13:53:02 -05:00
James Nugent 58ce5fa300 Merge pull request #5249 from hashicorp/make-vet
Run `vet` target on `default` target
2016-02-22 13:48:42 -05:00
James Nugent ac957ab329 Run `vet` target on `default` target 2016-02-22 13:35:50 -05:00
James Nugent a285ae1e2c Fix format string making vet fail 2016-02-22 13:34:15 -05:00
James Nugent bf83d2d924 Update CHANGELOG.md 2016-02-22 13:33:05 -05:00
James Nugent 463fde2509 Fix typo 2016-02-22 13:31:59 -05:00
James Nugent 7d1c43b3fc Merge branch 'f-digitalocean-record-fqdn' of https://github.com/stack72/terraform into stack72-f-digitalocean-record-fqdn 2016-02-22 13:29:42 -05:00
James Nugent 1d240c1c74 Update CHANGELOG.md 2016-02-22 13:26:36 -05:00
Edward Muller 9f376e13ef Fix up deps
Done with:

```console
$ godep restore -v
$ rm -rf Godep vendor/
$ godep save ./...
```

Spot checked, but things look legit. I don't (yet) know how to build
terraform though.
2016-02-22 10:21:33 -08:00
James Nugent 16b18df1fd Merge pull request #5238 from stack72/f-aws-redshift-calculate-cluster
provider/aws: Change Redshift Cluster cluster_type to be computed
2016-02-22 13:18:09 -05:00
James Nugent 9f4826d447 provider/google: Document schema conflict in network 2016-02-22 13:15:02 -05:00
James Nugent a449730494 Merge pull request #5241 from sl1pm4t/b-google-network-backcompat
provider/google: Fix Google compute network forces new resource
2016-02-22 13:11:42 -05:00
Paul Stack 94126d2299 Update CHANGELOG.md 2016-02-22 18:08:11 +00:00
Paul Stack 30dcc45635 Merge pull request #5178 from hashicorp/f-aws-iam-server-updates
provider/aws: Update IAM Server Cert
2016-02-22 18:07:22 +00:00
Paul Stack 7196055856 Update CHANGELOG.md 2016-02-22 18:06:54 +00:00
Paul Stack c4dd1a9a64 Merge pull request #5197 from hashicorp/f-aws-db-snapshot-copy
provider/aws: Fix copy_tags_to_snapshot for DB Instance
2016-02-22 18:05:41 +00:00
Lars Wander fc519b87e9 Update CHANGELOG.md 2016-02-22 10:56:35 -05:00
Lars Wander 252db7bacd Merge pull request #5245 from lwander/f-gcp-sql-address
provider/google: Add support for reading SQL instance assigned IP Addresses
2016-02-22 10:55:04 -05:00
Lars Wander 20f8104caf provider/google: Add support for reading SQL instance assigned IP Addresses 2016-02-22 10:38:14 -05:00
Paul Stack 0214319333 Merge pull request #4882 from stack72/f-aws-asg-getAutoscaleGroup
provider/aws: Autoscaling Group Code Refactor
2016-02-22 09:58:53 +00:00
Matt Morrison 6ccfd8db93 Fix Google compute network forces new resource 2016-02-22 21:55:42 +13:00
Paul Stack 1e7f10d3a3 Merge pull request #5066 from tpounds/fix-aws-elb-health-check-type
provider/aws: Change ELB health_check to list type
2016-02-21 22:38:10 +00:00
stack72 a70efec56e Merge branch 'joshgarnett-ecs_service_deployment_cfg' 2016-02-21 22:35:15 +00:00
stack72 93646b577a Update CHANGELOG.md 2016-02-21 22:34:45 +00:00
stack72 628fb1a37c provider/aws: Add test to ECS Service to make sure deployment values are
set
2016-02-21 22:33:48 +00:00
stack72 5f7060e9f5 Merge branch 'ecs_service_deployment_cfg' of https://github.com/joshgarnett/terraform into joshgarnett-ecs_service_deployment_cfg 2016-02-21 22:09:20 +00:00
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
Dmytro Aleksandrov 6886b75425 Fix record id parsing for hyphened hostnames (#5228) 2016-02-20 12:11:51 +02: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
Joshua Garnett 12958fb5e7 Added support for the deployment configuration settings to the ecs service resource. 2016-02-19 15:32:39 -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
stack72 3eab9f2ff0 provider/azurerm: Add documentation for the `azurerm_search_service`
resource
2016-02-19 00:57:51 +00:00
James Nugent dbc5464a19 Update jen20/riviera dependency 2016-02-19 00:57:15 +00:00
James Nugent 17a7990708 provider/azurerm: Add generic state refresh func 2016-02-19 00:56:11 +00:00
stack72 0d750c16f0 provider/azurerm: Support `azurerm_search_service` resource 2016-02-19 00:56:09 +00: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