Commit Graph

3373 Commits

Author SHA1 Message Date
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 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 a285ae1e2c Fix format string making vet fail 2016-02-22 13:34:15 -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 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 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 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 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 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 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
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
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 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
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
clint shryock ca29437581 provider/aws: Fix copy_tags_to_snapshot for DB Instance 2016-02-18 11:33:21 -06:00
James Nugent a040110c0f Gix gofmt errors 2016-02-18 08:51:27 -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 shryock fce562ba0b update name length 2016-02-17 17:03:31 -06:00
clint shryock c8178ad31c provider/aws: Update IAM Server Cert to allow name_prefix, auto generated namesprovider/aws: Update IAM Server Cert to allow name_prefix, auto generated namesdiff 2016-02-17 16:34:02 -06: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 f7504f7f9f Merge branch 'master' of https://github.com/vincer/terraform into vincer-master 2016-02-17 13:16:16 -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
Clint 37a708a2f0 Merge pull request #5155 from hashicorp/b-aws-route-error
provider/aws: Return an error if no route is found for an AWS Route
2016-02-17 10:02:48 -06:00
Clint 52e0cd82bd Merge pull request #5116 from hashicorp/b-aws-acc-tests
provider/aws: Update some tests to introduce more randomization
2016-02-17 10:02:20 -06:00
Joe Topjian dc5aa5e0bf Merge pull request #4878 from Fodoj/support-dvr
provider/openstack Add Distributed router support
2016-02-17 08:22:45 -07:00
Radek Simko 35345c92af fix: Return non-aws errors if bucket creation fails 2016-02-17 13:49:41 +00:00