Commit Graph

18682 Commits

Author SHA1 Message Date
stack72 6f4f13e462
Merge branch 'provider/aws/data_source_aws_efs_file_system' of https://github.com/craigknott/terraform into craigknott-provider/aws/data_source_aws_efs_file_system 2017-04-29 11:09:44 +12:00
Clint c72998062e Update CHANGELOG.md 2017-04-28 16:29:46 -05:00
Clint 7c59f7e282 provider/aws: Add EMR Security Configuration Resource (#14080)
* provider/aws: Add EMR Security Configuration

* provider/aws: Document EMR security configuration

* small refactoring and add an import test
2017-04-28 16:28:49 -05:00
Jake Champlin 1edc4555ad Update CHANGELOG.md 2017-04-28 17:17:39 -04:00
Jake Champlin d091881fb0 Merge pull request #14079 from hashicorp/b-instance-source-dest-check
provider/aws: Fix source_dest_check with network_interface
2017-04-28 17:17:06 -04:00
Scott Nowicki 8784f3de93 merge upstream master 2017-04-28 16:07:56 -05:00
Scott Nowicki 7b61ae5f4f merge origin/master 2017-04-28 16:03:29 -05:00
Scott Nowicki 1e80f4ff61 redirect output of az login to /dev/null to hide SPN detail (#11) 2017-04-28 15:45:00 -05:00
Jake Champlin d3c1f4b48d
provider/aws: Fix source_dest_check with network_interface
The default value for `source_dest_check` needs to remain the same, so as not to break any backwards compatibility, however, adding a new `network_interface` parameter with a pre-configured network_interface that has `source_dest_check` set to false throws a diff after initial apply. Since we don't want to change `source_dest_check` to computed in order to not break sane defaults, ignore the diff thrown if `network_interface` attributes are configured on an instance.

```
$ make testacc TEST=./builtin/providers/aws TESTARGS="-run=TestAccAWSInstance_primaryNetworkInterfaceSourceDestCheck"
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/28 16:26:02 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSInstance_primaryNetworkInterfaceSourceDestCheck -timeout 120m
=== RUN   TestAccAWSInstance_primaryNetworkInterfaceSourceDestCheck
--- PASS: TestAccAWSInstance_primaryNetworkInterfaceSourceDestCheck (134.20s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    134.211s
```

```
$ make testacc TEST=./builtin/providers/aws TESTARGS="-run=TestAccAWSInstance_sourceDestCheck"
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/28 16:15:14 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSInstance_sourceDestCheck -timeout 120m
=== RUN   TestAccAWSInstance_sourceDestCheck
--- PASS: TestAccAWSInstance_sourceDestCheck (179.81s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws   179.815s
```

Fixes: #14068
2017-04-28 16:35:54 -04:00
Jake Champlin 0eb191d3a3 Update CHANGELOG.md 2017-04-28 16:27:26 -04:00
Jake Champlin ba52f8045f Merge pull request #14077 from hashicorp/triton-allow-insecure
provider/triton: Add `insecure_skip_tls_verify`
2017-04-28 16:26:43 -04:00
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
James Nugent 01714eceb5 deps: Update github.com/joyent/triton-go 2017-04-28 11:54:11 -07:00
Maciej Skierkowski 5c4d85d7dc Merge pull request #14022 from hashicorp/skierkowski/tfe-state-docs-0-9-update
Updating TFE state documentation for 0.9.X
2017-04-28 11:46:00 -07:00
James Nugent 362ad5d7fa Update CHANGELOG.md 2017-04-28 11:03:17 -07:00
James Nugent fcddc1d077 Merge branch 'zero-below-triton_cloud_config' 2017-04-28 11:02:32 -07:00
James Nugent 04436e4cbd provider/triton: Clarify cloud_config docs 2017-04-28 11:01:50 -07:00
Maciej Skierkowski b142c04db2 removing whitespace 2017-04-28 10:54:37 -07:00
Maciej Skierkowski 8cee4eb12b Adding a deprecation warning on 'terraform remote config' command 2017-04-28 10:52:59 -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
Tom Harvey ece4b13305 Merge pull request #14054 from dtzar/patch-1
Fix azurerm_container_service examples
2017-04-28 09:57:29 +01:00
Dejan Golja 7c4a242661 Fixes the bug where sns delivery policy get always recreated (see https://github.com/hashicorp/terraform/issues/14024) 2017-04-28 13:18:12 +10:00
Scott Nowicki 4438a06891 merge branch topic-101-vm-simple-linux 2017-04-27 19:51:24 -05:00
Scott Nowicki 291305bddb run CI on branch prior to merge 2017-04-27 19:47:01 -05:00
Paul Stack 990b6759f1 Update CHANGELOG.md 2017-04-28 12:10:38 +12: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
Scott Nowicki 001acd666c merge upstream 2017-04-27 18:11:47 -05:00
Scott Nowicki 5f577c7b3a added az vm show between apply & destroy 2017-04-27 18:10:17 -05:00
Scott Nowicki 121a60192f Enabled CI runs for master
This should enable CI on PRs for examples (until an example PR is merged)
2017-04-27 18:00:43 -05:00
Scott Nowicki 714076043e updated incorrect descriptions 2017-04-27 17:32:49 -05:00
Scott Nowicki 7a34501edf removed container resource; added terraform show 2017-04-27 17:13:19 -05:00
Dana Hoffman eeecf5183c Update CHANGELOG.md 2017-04-27 13:04:46 -07: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
David Tesar 9d4a23d9a8 fix example templates
With the FQDN specified, it throws error:
 ```
1 error(s) occurred:
* azurerm_container_service.test: "agent_pool_profile.0.fqdn": this field cannot be set
```
2017-04-27 12:53:39 -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 0f47cd47d8 Update CHANGELOG.md 2017-04-28 05:51:31 +12: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
Radek Simko d8c839f643 Update CHANGELOG.md 2017-04-27 18:50:09 +01: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
Scott Nowicki 77775462ff consolidated deploy and after_deploy into a single script; simplified ci process; added os_profile_linux_config 2017-04-27 12:16:00 -05: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
Scott Nowicki 64b52ee25f merge upstream 2017-04-27 11:44:57 -05:00
Scott Nowicki 829b69625b early prep for CI of examples (#7)
* early prep for CI of examples
* added note to prevent moving upstream
2017-04-27 11:40:53 -05:00
Craig Knott 7781baa24b Change fmt error to errwrap wrapf 2017-04-27 11:39:10 -05:00
Radek Simko 12e7412434 provider/digitalocean: Log HTTP requests & responses in DEBUG+ level (#14039) 2017-04-27 17:14:37 +01:00
Craig Knott aa2e02ab14 Added data source for aws_efs_file_system, heavily based off of resource_aws_efs_file_systems read method. 2017-04-27 10:52:36 -05:00