Commit Graph

3481 Commits

Author SHA1 Message Date
Joakim Sernbrant 7d30423a61 provider/cloudstack: Improve ssh keypair handling
- adds support for projects

- adds support for public_key strings as well as filenames
2016-02-26 23:06:16 +01:00
Lars Wander 6a8c814be8 Merge pull request #4087 from ajcrowe/google-instance_groups
provider/google: Support for unmanaged instance groups (google_compute_instance_group)
2016-02-26 15:33:08 -05:00
Paul Stack a372800cd0 Merge pull request #5318 from stack72/f-aws-route53zone-updateComment
provider/aws: Add ability to update r53 zone comment
2016-02-26 19:43:13 +00:00
James Nugent f249a432fc Merge pull request #5329 from hashicorp/b-5310
provider/aws: Fix crash creating rules in aws SGs
2016-02-26 14:42:01 -05:00
Alex Crowe b3f7d1e386 Added google_compute_instance_group resource 2016-02-26 18:41:35 +00:00
Paul Stack cc0c07e93a Merge pull request #5337 from lvjp/b-docker-container-restart
provider/docker: #2417 Add support for restart policy unless-stopped
2016-02-26 14:18:29 +00:00
Radek Simko 5b4fccaa73 provider/aws: Add acceptance test for IAM Account Password Policy 2016-02-26 13:29:34 +00:00
stack72 d750d4d1cc provider/aws: Add ability to update r53 zone comment 2016-02-26 13:26:25 +00:00
Radek Simko f7f3d95a9b provider/aws: Add support for AWS Account Password Policy 2016-02-26 11:04:25 +00:00
Verdoïa Laurent ea5f53782a provider/docker: #2417 Add support for restart policy unless-stopped 2016-02-26 12:38:31 +09:00
James Nugent 5b548e938c Merge pull request #5327 from Originate/s3-website-routing-rules
Added routing rules to s3 buckets
2016-02-25 14:43:55 -05:00
James Nugent 3adae0216c provider/aws: Fix crash creating rules in aws SGs
This commit uses Group Name in preference to Group ID where appropriate
in the aws_security_group_rule resource. This fixes the crash reported
in #5310.

Fixes #5310.
2016-02-25 13:50:24 -05:00
Drew Minnear ef50479e8a added routing rules to s3 buckets 2016-02-25 10:19:23 -08:00
Paul Hinze 9202bc0e1c provider/vsphere: Fix gofmt 2016-02-25 08:50:02 -06:00
Paul Hinze 984d682955 Merge pull request #4284 from matt-deboer/master
Added support for disk init types
2016-02-25 08:44:27 -06:00
Radek Simko 4b8726dc2b Merge pull request #5305 from TimeIncOSS/f-s3-obj-update-and-versioning
provider/aws: Enable updates & versioning for s3_bucket_object
2016-02-25 12:19:34 +00:00
Radek Simko 44246ca126 provider/aws: Add tests for s3_bucket_object w/ versioning enabled 2016-02-25 12:04:18 +00:00
Radek Simko ef85147559 provider/aws: Add tests for s3_bucket_object updates 2016-02-25 12:04:18 +00:00
Radek Simko 9377b301ca provider/aws: Cleanup s3_bucket_object acceptance tests
- the goal was to allow running tests in parallel and to get rid of global variables in the aws package
2016-02-25 12:04:18 +00:00
Radek Simko 24ac996963 provider/aws: Add support for versioned objects 2016-02-25 12:04:18 +00:00
Radek Simko 2f8b9edaf8 provider/aws: Add support for s3_bucket_object updates 2016-02-25 12:04:16 +00:00
James Nugent 74e5711f08 Merge pull request #5182 from Originate/mb-fix-lambda-vpc-implementation
provider/aws: Fixes terraform crash when lambda VpcId is nil
2016-02-24 17:52:38 -05:00
Paul Hinze 893bfb3ff4 provider/aws: Fix int overflow on 386 builds
386 architecture builds were failing with:

```
builtin/providers/aws/resource_aws_sns_topic_subscription.go:216: constant 60000000000 overflows int
```
2016-02-24 13:55:01 -06:00
Paul Hinze cb8f0f04b5 fix go vet warnings
```
go tool vet -all .
builtin/providers/aws/resource_aws_elasticache_security_group.go:130: arg apierr.Code in printf call is a function value, not a function call
builtin/providers/aws/resource_aws_elasticache_subnet_group.go:155: arg apierr.Code in printf call is a function value, not a function call
```
2016-02-24 09:48:32 -06:00
Radek Simko ebf2fd54e5 provider/aws: Clean up whitespaces 2016-02-24 14:58:17 +00:00
Radek Simko 70f045e46e provider/aws: Breaking change - Trim off quotes for aws_s3_bucket_object.etag 2016-02-24 14:58:17 +00:00
Maxime Bury f92b2b7c58 Also ignore empty VPC config after all 2016-02-23 12:56:46 -08:00
Paul Stack e454b21100 Merge pull request #5271 from stack72/f-aws-dynamodb-stream-arn
provider/aws: Enable DynamoDB Table to output `stream_arm` when streams are enabled
2016-02-23 17:27:22 +00:00
Paul Stack 039065f63a Merge pull request #5223 from stack72/f-aws-kinesis-retention-period
provider/aws: Implement RetentionPeriod Changes for Kinesis Stream
2016-02-23 17:26:12 +00:00
stack72 8d6cfe8e89 Implement RetentionPeriod Changes for AWS Kinesis Stream 2016-02-23 17:15:33 +00:00
stack72 0ce4aed52a provider/aws: Enable DynamoDB Table to output `stream_arm` when streams
are enabled
2016-02-23 15:40:41 +00:00
Paul Hinze b5e6a4fac7 Merge pull request #5101 from tpounds/fix-read-aws-asg-termination-policies
provider/aws: Fix reading auto scaling group termination policies
2016-02-23 08:03:18 -06:00
Trevor Pounds 066a60debe Add termination policies acceptance test. 2016-02-22 17:05:10 -08:00
Trevor Pounds b39cc55f37 Cleanup termination policy update logic. 2016-02-22 17:05:09 -08:00
Trevor Pounds 44b00782c3 Fix termination policies read logic. 2016-02-22 17:05:09 -08:00
Paul Hinze 79dee04a98 provider/google: cover fix in #5110 2016-02-22 18:55:22 -06:00
Paul Hinze 1d67fc4bb8 Merge pull request #5110 from fd/patch-1
google_pubsub_subscription crashes when ack_deadline_seconds is provided
2016-02-22 18:54:19 -06:00
Paul Hinze b822c6fa1a Merge pull request #5123 from ColinHebert/start_host_config
provider/docker: Stop providing the hostConfig while starting the container
2016-02-22 18:49:03 -06:00
Paul Hinze ce948c0dea Merge pull request #5120 from paybyphone/paybyphone_igw_destroyfix
IGW detatch waiter tweak, 30 not found checks w/15 min max
2016-02-22 18:17:12 -06:00
Paul Hinze 9c0e52bc4b Merge pull request #5100 from hashicorp/b-aws-sg-drift-updates
provider/aws: Security Group drift updates
2016-02-22 18:10:49 -06:00
Paul Stack 57f58dec98 Merge pull request #5262 from stack72/b-aws-redshift-cluster-public
provider/aws: `aws_redshift_cluster` publicly_accessible now defaults true
2016-02-22 23:19:30 +00:00
stack72 e822d46843 provider/aws: `aws_redshift_cluster` publicly_accessible now defaults to
true
2016-02-22 23:11:55 +00:00
Paul Hinze 5528abb51e Merge pull request #5255 from hashicorp/phinze/improve-vpc-cidr-errmsg
provider/aws: improve vpc cidr_block err message
2016-02-22 16:54:47 -06:00
Paul Hinze ce74e3d8f0 provider/aws: improve vpc cidr_block err message
Pull CIDR block validation into a shared func ready to be used elsewhere

Example of new err message:

```
Errors:

  * aws_vpc.foo: "cidr_block" must contain a valid network CIDR,
    expected "10.0.0.0/16", got "10.0.1.0/16"
```
2016-02-22 16:44:33 -06:00
Paul Stack d5fb018250 Merge pull request #4945 from stack72/aws-rds-enhanced-monitoring
provider/aws: Enabled Enhanced Monitoring for RDS
2016-02-22 22:02:09 +00:00
Otto Jongerius eb2407fccf provider/datadog: Replace separate monitors with one generic monitor with read functionality. 2016-02-22 15:04:11 -05:00
Kelvin Law 775a3f8826 provider/datadog: Add `query` parameter to `metric_alert`
`query` is used when it is specified by the user, if not
`metric`/`tags`/`keys`/`time_aggr`/`window` is used instead.
2016-02-22 15:03:51 -05:00
Otto Jongerius f407eea3f7 provider/datadog: Various enhancements
- Don't drop wildcard if it's the only one.
- Remove monitor resource, it's been replaced by metric_alert,
  outlier_alert and service_check
- Refactor to be closer to the API; each resource creates exactly *one*
  resource, not 2, this removes much unneeded complexity. A warning
  threshold is now supported by the API.
- Remove fuzzy resources like graph, and resources that used them for
  dashboard and screenboards. I'd welcome these resources, but the
  current state of Terraform and the Datadog API does not allow these to
  be implemented in a clean way.
- Support multiple thresholds for metric alerts, remove notify argument.
2016-02-22 15:02:50 -05:00
Vincenzo Prignano 1b84048aef provider/datadog: Initial commit 2016-02-22 15:02:35 -05: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 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
clint shryock 280054a387 provider/aws: Security Rules drift and sorting changes
This commit adds failing tests to demonstrate the problem presented with AWS
aggregating the security group rules
2016-02-19 16:51:08 -06: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
Maxime Bury 288ba868e4 Harden things around VPC config 2016-02-18 13:45:32 -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
Maxime Bury f0f3c430a8 Generalize fix to ignore empty VPC config 2016-02-17 21:45:13 -05:00
Maxime Bury eb2aaef016 VpcId can be nil in the wild 2016-02-17 20:06:18 -05: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