Commit Graph

7243 Commits

Author SHA1 Message Date
James Nugent eaed36b47e provider/triton: Add `insecure_skip_tls_verify`
This commit adds an option to skip TLS verification of the Triton
endpoint, which can be useful for private or temporary installations not
using a certificate signed by a trusted root CA.

Fixes #13722.
2017-04-28 11:56:26 -07:00
Brian Cervenka 93a0bad923 provider/triton: Add metadata key for cloud-init
Under joyent/triton, the cloud-init cloud-config data actually comes out
of a key called cloud-init:user-data, as opposed to to the standard
user-data. This will make it possible to send the cloud-config data to
triton machines.

Documentation reference: https://docs.joyent.com/public-cloud/instances/virtual-machines/images/linux/ubuntu-certified#cloud-init-examples
2017-04-28 10:52:54 -07:00
Dan Peterson 8ec67413be providers/heroku: wait for spaces to be allocated (#14052) 2017-04-28 08:40:18 -05:00
Paul Stack 93e5d573ce provider/aws: Exclude aws_instance volume tagging for China and Gov Clouds (#14055)
Fixes: #14049

The China and Gov regions do not support the new way of tagging
instances and volumes on creation. Therefore, we need to hack this to
make sure we don't try and set these on instance creation
2017-04-28 12:09:18 +12:00
Dana Hoffman 2b911dcc58 provider/google: ignore certain project services that can't be enabled directly via the api (#13730) 2017-04-27 13:00:54 -07:00
Dan Peterson 3b47f9439b providers/heroku: use resourceHerokuAppFeature prefix (#14051)
Change eg resourceAppFeatureRead to resourceHerokuAppFeatureRead to
conform to common style.
2017-04-27 14:18:55 -05:00
Paddy 973eda94c7 Merge pull request #14045 from hashicorp/paddy_project_metadata_tests
provider/google: fix project metadata tests
2017-04-27 11:52:26 -07:00
Paddy 9f3afb4ea7 Fix both Radek & Dana's comments.
Style nits, but clean code is happy code.
2017-04-27 11:39:13 -07:00
Paul Stack 0317a244eb provider/aws: aws_spot_instance_request not forcenew on volume_tags (#14046)
The introduction of volume_tags was causing a ForceNew on
spot_instance_requests

This has now been treated the same way as tags

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSSpotInstanceRequest_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/28 05:17:42 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSSpotInstanceRequest_ -timeout 120m
=== RUN   TestAccAWSSpotInstanceRequest_basic
--- PASS: TestAccAWSSpotInstanceRequest_basic (213.75s)
=== RUN   TestAccAWSSpotInstanceRequest_withBlockDuration
--- PASS: TestAccAWSSpotInstanceRequest_withBlockDuration (212.14s)
=== RUN   TestAccAWSSpotInstanceRequest_vpc
--- PASS: TestAccAWSSpotInstanceRequest_vpc (130.44s)
=== RUN   TestAccAWSSpotInstanceRequest_SubnetAndSG
--- PASS: TestAccAWSSpotInstanceRequest_SubnetAndSG (234.43s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	790.791s
```
2017-04-28 05:50:51 +12:00
Julien Pivotto ccb34b702d provider/digitalocean: prevent new resources when using ID's of images with slugs (#13879)
When you specify the ID of an image that has a slug, terraform would
store its slug to the state, hence it would always recreate the image.

This commit fixes it by storing the image as an ID when it is specified
by and ID by the user, ignoring the slug.

Closes #12751.
Fixes #12255.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2017-04-27 18:48:58 +01:00
Paddy 8aadf6ecdd provider/google: fix project metadata tests
Update our project metadata tests to stand up their own projects, so
they don't trample all over each other anymore.

The fixes for this were more invasive than I had hoped they would be,
but the tests all pass now (when run sequentially) and there's no reason
for them not to pass when run in parallel.
2017-04-27 10:28:31 -07:00
Paddy 170b5cff3c Merge pull request #14042 from hashicorp/paddy_ds_google_network_test_randomize
provider/google: randomize network data source test name.
2017-04-27 09:50:24 -07:00
Radek Simko 12e7412434 provider/digitalocean: Log HTTP requests & responses in DEBUG+ level (#14039) 2017-04-27 17:14:37 +01:00
Paddy ece9f85983 provider/google: randomize network data source test name.
We have tests failing because we hard-coded the network name in our
network data source test. By randomizing it, we don't fix the dangling
resource problem, but do make the tests pass again.
2017-04-27 08:52:02 -07:00
Brian Antonelli 2dd7e72674 Fix for getting partition for federated users (#13992)
Federated users calling `iam:GetUser` will get the error code `InvalidClientTokenId` so this shouldn't bail out but instead continue on to try `sts:GetCallerIdentity`.
2017-04-27 10:24:53 -05:00
James Bardin 78c2720a4c Merge pull request #13793 from paybyphone/data_source_plan_count_boundary
core: Add CountBoundaryTransformer to the plan graph builder
2017-04-27 11:22:57 -04:00
Dan Peterson e495c6bacc providers/heroku: add heroku_app_feature resource (#14035) 2017-04-27 09:55:07 -05:00
Jake Champlin e91d915154 Merge pull request #13956 from weargoggles/patch-1
provider/nomad: Add TLS options
2017-04-27 10:43:50 -04:00
Julien Pivotto bfc1008b4d provider/digitalocean: Remove unneeded droplet test (#14034)
Reverts #13883.

Quoting @radeksimko: "We actually refresh the state
as part of every test step, so this is not necessary"

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2017-04-27 14:46:42 +01:00
Radek Simko 086af4bd62 provider/aws: Retry setting KMS key rotation on DisabledException (#14029) 2017-04-27 12:42:36 +01:00
Tom Harvey a23201a415 Merge pull request #13965 from codekoala/azurerm_lb_private_ip_address
provider/azurerm: Expose any dynamically-assigned private IP address
2017-04-27 11:19:43 +01:00
Julien Pivotto a3e775cb94 Rename datasource_digitalocea{l,n}_image.go (#14025)
refs #13787

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2017-04-27 11:11:57 +01:00
Dan Peterson cf6e86a127 providers/heroku: use a helper for common app post-create tasks (#13990)
Buildpacks were being configured post-create for non-org apps but not
for org apps. Consolidate post-create tasks into a helper used by both
paths.
2017-04-26 17:02:53 -05:00
Paddy ec7869c6a8 Merge pull request #14012 from danawillow/tests
provider/google: a few quick test fixes
2017-04-26 14:38:01 -07:00
Dana Hoffman 9942c157ac provider/google: a few quick test fixes 2017-04-26 13:24:40 -07:00
Paul Stack c953a2fc41 provider/aws: Set aws_instance volume_tags to be Computed (#14007)
Fixes: #14003

When an EBS volume was created and tags were specified on that resource
and NOT the aws_instance it was attached to, the tags would be removed
on subsequent Terraform runs.

We need to set volume_tags to be Computed to allow for changes to EBS
volumes not created as part of the instance but that are attached to the
instance

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSInstance_volumeTagsComputed'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/27 07:33:36 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSInstance_volumeTagsComputed -timeout 120m
=== RUN   TestAccAWSInstance_volumeTagsComputed
--- PASS: TestAccAWSInstance_volumeTagsComputed (151.37s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	151.411s
```
2017-04-27 07:50:06 +12:00
Paul Stack f9ba882f73 provider/aws: Update aws_ebs_volume when attached (#14005)
Fixes: #12496

When an EBS volume was attached to an instance and the user tried to
resize, they would get an error as follows:

```
* aws_ebs_volume.ebs_data_volume: Error waiting for Volume (vol-027e83f7) to become available: unexpected state 'in-use', wanted target 'available'. last error: %!s(<nil>)
```

`available` is a state *only* when creating an EBS volume that is not attached. When an instance is attached, it will go into the state `in-use`. Therefore `in-use` is a valid state when modifying an EBS volume that is attached:

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSEBSVolume_'                                   ✹ ✭
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/27 07:08:18 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSEBSVolume_ -timeout 120m
=== RUN   TestAccAWSEBSVolume_importBasic
--- PASS: TestAccAWSEBSVolume_importBasic (41.10s)
=== RUN   TestAccAWSEBSVolume_basic
--- PASS: TestAccAWSEBSVolume_basic (38.22s)
=== RUN   TestAccAWSEBSVolume_updateAttachedEbsVolume
--- PASS: TestAccAWSEBSVolume_updateAttachedEbsVolume (199.11s)
=== RUN   TestAccAWSEBSVolume_updateSize
--- PASS: TestAccAWSEBSVolume_updateSize (70.53s)
=== RUN   TestAccAWSEBSVolume_updateType
--- PASS: TestAccAWSEBSVolume_updateType (69.75s)
=== RUN   TestAccAWSEBSVolume_updateIops
--- PASS: TestAccAWSEBSVolume_updateIops (70.38s)
=== RUN   TestAccAWSEBSVolume_kmsKey
--- PASS: TestAccAWSEBSVolume_kmsKey (76.64s)
=== RUN   TestAccAWSEBSVolume_NoIops
--- PASS: TestAccAWSEBSVolume_NoIops (39.80s)
=== RUN   TestAccAWSEBSVolume_withTags
--- PASS: TestAccAWSEBSVolume_withTags (38.04s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	643.609s
```
2017-04-27 07:30:23 +12:00
Christoph Blecker 0ffb5aa1d6 Fix vet errors in fastly provider (#14001) 2017-04-27 06:42:53 +12:00
James Nugent 77a24f8a5b Merge pull request #14000 from hashicorp/triton-envvars
provider/triton: Read TRITON_* as well as SDC_*
2017-04-26 10:56:48 -07:00
Pete Wildsmith 5d40be3209 reformat incorrectly formatted file 2017-04-26 18:48:57 +01:00
James Nugent 69ba1d4bad provider/triton: Read TRITON_* as well as SDC_*
The Triton CLI tools have been using TRITON_* as their configuration
environment variables for some time now. This commit makes Terraform use
them in preference to any SDC_* variables set, and allows Terraform to
work with the credentials set by the `triton env` in the CLI.
2017-04-26 10:46:18 -07:00
stack72 f094dda901
Merge branch 'master' of github.com:hashicorp/terraform 2017-04-27 05:45:17 +12:00
stack72 fd48f91876
provider/gitlab: Addition of the documentation link for gitlab to sidebar
```
% make testacc TEST=./builtin/providers/gitlab
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/27 05:37:02 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/gitlab -v  -timeout 120m
=== RUN   TestProvider
--- PASS: TestProvider (0.00s)
=== RUN   TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN   TestAccGitlabProject_basic
--- PASS: TestAccGitlabProject_basic (41.11s)
=== RUN   TestGitlab_validation
--- PASS: TestGitlab_validation (0.00s)
=== RUN   TestGitlab_visbilityHelpers
--- PASS: TestGitlab_visbilityHelpers (0.00s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/gitlab	41.125s
```
2017-04-27 05:44:05 +12:00
stack72 898ac02854
Merge branch 'feature/gitlab_provider' of https://github.com/richardc/terraform into richardc-feature/gitlab_provider 2017-04-27 05:08:12 +12:00
= fc942c6202 refactor the read 2017-04-26 09:25:10 -06:00
Josh VanderLinden 790874b372 Iterate over loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations directly 2017-04-26 15:03:42 +00:00
Paul Stack 39d7400813 provider/aws: Change running of CloudTrail tests to not be parallel (#13982)
We can only ever have 5 cloudtrails in an AWS account so we want to make
sure we run these tests serially to make sure we don't exhaust limits
and get non-deterministic failures
2017-04-27 02:41:47 +12:00
Paul Stack 011cab5917 provider/aws: Add support for CustomOrigin timeouts to aws_cloudfront_distribution (#13367)
```

```
2017-04-27 02:13:59 +12:00
James Healy ae7df37e6f Make dnsimple_records importable (#9130)
* Make dnsimple_records importable

terraform 0.7 supports importing a resource into the local state, and
this adds that feature to the dnsimple_record resource.

Unfortunately, the DNSimple v1 API requires a domain name and record ID
to fetch a record, so the import command accepts both pieces of data as
a slash-delimted string like so:

    terraform import dnsimple_record.test example.com/1234

* add an acceptance test for importing a dnsimple_record
2017-04-27 02:07:23 +12:00
Jake Champlin 64134418a5 Merge pull request #12933 from hashicorp/f-network-interfaces
provider/aws: Add network_interface to aws_instance
2017-04-26 08:05:21 -04:00
Dana Hoffman 6ff114a178 provider/google: fix panic in GKE provisioning with addons (#13954) 2017-04-26 11:35:19 +01:00
Josh VanderLinden d3687fc9e9 Expose any dynamically-assigned private IP address 2017-04-26 05:22:01 +00:00
Joshua Spence 76b0eefacc Fix validation of the `name_prefix` parameter of the `aws_alb` resource (#13441)
This parameter is being validated using the wrong validation function, which means that we are incorrectly disallowing a `name_prefix` value ending with a dash.
2017-04-26 11:48:02 +12:00
Joseph Anthony Pasquale Holsten 87ebc19ae5 Merge pull request #13785 from bhood4/master
provider/ultradns: ultradns_rdpool resource minor improvements
2017-04-25 15:59:04 -07:00
Jake Champlin 1e9593fa61 Merge pull request #13952 from danawillow/is-13823
provider/google: documentation and validation fixes for forwarding rules
2017-04-25 18:51:14 -04:00
Jake Champlin 22ed31c7a6 Merge pull request #13921 from bernerdschaefer/bs-create-space
providers/heroku: add heroku_space resource
2017-04-25 18:43:42 -04:00
Bernerd Schaefer e7c904a87d Add note about type conversion 2017-04-25 15:32:27 -07:00
Paul Stack f4015b43c5 provider/aws: Support aws_instance and volume tagging on creation (#13945)
Fixes: #13173

We now tag at instance creation and introduced `volume_tags` that can be
set so that all devices created on instance creation will receive those
tags

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSInstance_volumeTags'                      2 ↵ ✚ ✭
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/26 06:30:48 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSInstance_volumeTags -timeout 120m
=== RUN   TestAccAWSInstance_volumeTags
--- PASS: TestAccAWSInstance_volumeTags (214.31s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	214.332s
```
2017-04-26 10:12:38 +12:00
Pete Wildsmith ad604d91dc Add TLS options to Nomad provider schema 2017-04-25 23:11:24 +01:00
Joshua Spence d721ff6d66 provider/aws: Sort AMI and snapshot IDs (#13866)
As a follow up to #13844, this pull request sorts the AMIs and snapshots returned from the aws_ami_ids and aws_ebs_snapshot_ids data sources, respectively.
2017-04-25 15:11:21 -07:00