Commit Graph

18737 Commits

Author SHA1 Message Date
Roberto Jung Drebes 50f8b9407e Merge branch 'master' into cloud_router 2017-05-05 11:43:41 +02:00
Kannan Goundan e1455350b8 aws_route53_record: More consistent unquoting of TXT/SPF records. (#14170)
* aws_route53_record: More consistent unquoting of TXT/SPF records.

Before, 'flatten' would remove the first two quotes.  This results in
confusing behavior if the value contained two quoted strings.

Now, 'flatten' we only remove the surrounding qutoes, which is more
consistent with 'expand'.

Should improve hashicorp/terraform#8423, but more could still be done.

* aws/route53: Cover new bugfix with an acceptance test
2017-05-05 11:41:53 +02:00
Paul Thrasher 26a91abd0c website: Add code coloring to aws_security_group doc 2017-05-04 17:07:57 -07:00
Martin Atkins 58f5257678 core: context test for partially-unknown splat lists
This is a context test for the behavior enabled by #14135, as some
insurance to decrease the chance that we break it again.
2017-05-04 16:55:32 -07:00
Dana Hoffman 3f4b75c2a3 Update CHANGELOG.md 2017-05-04 16:22:25 -07:00
Dana Hoffman b7d0140aaf provider/google: Move 404 checking into a function in provider.go, call it from instance and IGM (#14190) 2017-05-04 16:15:36 -07:00
Martin Atkins bfd42b0fa7 Update CHANGELOG.md 2017-05-04 15:58:37 -07:00
Martin Atkins b4df03bca4 core: allow partially-unknown lists from splat syntax
This was actually redundant anyway since HIL itself applied a similar
rule where any partially-unknown list would be automatically flattened
to a single unknown value.

However, now we're changing HIL to explicitly permit partially-unknown
lists so that we can allow the index operator [...] to succeed when
applied to one of the elements that _is_ known.

This, in conjunction with hashicorp/hil#51 and hashicorp/hil#52,
fixes #3449.
2017-05-04 15:56:35 -07:00
Martin Atkins edb362cfb3 govendor fetch github.com/hashicorp/hil/... 2017-05-04 15:56:35 -07:00
Martin Atkins b28fb766db Update CHANGELOG.md 2017-05-04 15:37:50 -07:00
Martin Atkins 5ac311e2a9 main: synchronize writes to VT100-faker on Windows
We use a third-party library "colorable" to translate VT100 color
sequences into Windows console attribute-setting calls when Terraform is
running on Windows.

colorable is not concurrency-safe for multiple writes to the same console,
because it writes to the console one character at a time and so two
concurrent writers get their characters interleaved, creating unreadable
garble.

Here we wrap around it a synchronization mechanism to ensure that there
can be only one Write call outstanding across both stderr and stdout,
mimicking the usual behavior we expect (when stderr/stdout are a normal
file handle) of each Write being completed atomically.
2017-05-04 15:36:51 -07:00
James Bardin e76654af01 Merge pull request #14225 from hashicorp/jbardin/hcl-update
update vendored hcl
2017-05-04 18:22:00 -04:00
James Bardin f37c08929b update vendored hcl 2017-05-04 17:08:18 -04:00
Jake Champlin d63ad7f949 Merge pull request #14223 from hashicorp/b-update-nomad-tests
provider/nomad: Update Nomad provider tests
2017-05-04 16:18:49 -04:00
Jake Champlin 999611b888
provider/nomad: Update Nomad provider tests
Nomad server could have already purged the test job `foo` by the time the test checks to make sure the `foo` job has been deleted, resulting in a `404` response from the Nomad server.

```
$ make testacc TEST=./builtin/providers/nomad
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/05/04 15:51:01 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/nomad -v  -timeout 120m
=== RUN   TestProvider
--- PASS: TestProvider (0.00s)
=== RUN   TestResourceJob_basic
--- PASS: TestResourceJob_basic (1.78s)
=== RUN   TestResourceJob_refresh
--- PASS: TestResourceJob_refresh (3.30s)
=== RUN   TestResourceJob_disableDestroyDeregister
--- PASS: TestResourceJob_disableDestroyDeregister (3.63s)
=== RUN   TestResourceJob_idChange
--- PASS: TestResourceJob_idChange (3.44s)
=== RUN   TestResourceJob_parameterizedJob
--- PASS: TestResourceJob_parameterizedJob (1.76s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/nomad  13.924s
```
2017-05-04 15:52:55 -04:00
Paul Stack 9459ffa302 Update CHANGELOG.md 2017-05-04 21:52:09 +03:00
Paul Stack 3bb4c56165 provider/aws: Prevent Crash when importing aws_route53_record (#14218)
Fixes: #14217

We now check to make sure that we have the correct number of parts when
we have split the resource ID. It isn't an elegant fix but it works as
expected. Also added some more documentation about what is required to
actually construct the Id needed for import
2017-05-04 21:51:10 +03:00
Paul Stack 354d6b832c Update CHANGELOG.md 2017-05-04 20:58:13 +03:00
Daniel Schierbeck 7a2f002f56 Handle `google_storage_bucket_object` not being found (#14203)
Mark the resource as no longer available.
2017-05-04 20:57:49 +03:00
Paul Stack 9f7c5394f1 Update CHANGELOG.md 2017-05-04 20:46:50 +03:00
Paul Stack 046bb0e1c3 provider/aws: Support run_command_parameters in aws_cloudwatch_event_target (#14067)
```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSCloudWatchEventTarget_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/29 11:00:09 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSCloudWatchEventTarget_ -timeout 120m
=== RUN   TestAccAWSCloudWatchEventTarget_basic
--- PASS: TestAccAWSCloudWatchEventTarget_basic (58.75s)
=== RUN   TestAccAWSCloudWatchEventTarget_missingTargetId
--- PASS: TestAccAWSCloudWatchEventTarget_missingTargetId (36.11s)
=== RUN   TestAccAWSCloudWatchEventTarget_full
--- PASS: TestAccAWSCloudWatchEventTarget_full (90.30s)
=== RUN   TestAccAWSCloudWatchEventTarget_ssmDocument
--- PASS: TestAccAWSCloudWatchEventTarget_ssmDocument (38.64s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	223.833s
```
2017-05-04 20:46:11 +03:00
Paul Stack 560a723c9e Update CHANGELOG.md 2017-05-04 20:38:00 +03:00
Paul Stack e18f8df845 provider/aws: Add support for aws_ssm_maintenance_window (#14087)
* provider/aws: Add support for aws_ssm_maintenance_window

Fixes: #14027

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSSSMMaintenanceWindow_basic'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/29 13:38:19 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSSSMMaintenanceWindow_basic -timeout 120m
=== RUN   TestAccAWSSSMMaintenanceWindow_basic
--- PASS: TestAccAWSSSMMaintenanceWindow_basic (51.69s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	51.711s
```

* provider/aws: Add documentation for aws_ssm_maintenance_window

* provider/aws: Add support for aws_ssm_maintenance_window_target

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSSSMMaintenanceWindowTarget'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/29 16:38:22 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSSSMMaintenanceWindowTarget -timeout 120m
=== RUN   TestAccAWSSSMMaintenanceWindowTarget_basic
--- PASS: TestAccAWSSSMMaintenanceWindowTarget_basic (34.68s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	34.701s
```

* provider/aws: Adding the documentation for aws_ssm_maintenance_window_target

* provider/aws: Add support for aws_ssm_maintenance_window_task

* provider/aws: Documentation for aws_ssm_maintenance_window_task
2017-05-04 20:36:28 +03:00
stack72 3fe6b536ff
Merge branch 'richardc-feature/gitlab_project_hook' 2017-05-04 20:00:44 +03:00
stack72 6ea0f6c1fe
provider/gitlab: Adding default values to gitlab_project_hook resource 2017-05-04 19:59:32 +03:00
stack72 93b838fb14
Merge branch 'feature/gitlab_project_hook' of https://github.com/richardc/terraform into richardc-feature/gitlab_project_hook 2017-05-04 19:56:10 +03:00
Paul Stack 7354fe0d29 Update CHANGELOG.md 2017-05-04 19:25:31 +03:00
stack72 50f0ed857b
Merge branch 'skalle-g-route-import' 2017-05-04 19:24:19 +03:00
stack72 b35f004047
provider/google: Minor formatting issues on import of compute route test 2017-05-04 19:17:25 +03:00
stack72 1025748ce0
Merge branch 'g-route-import' of https://github.com/skalle/terraform into skalle-g-route-import 2017-05-04 19:13:58 +03:00
Paul Stack 25681bdb69 Update CHANGELOG.md 2017-05-04 18:52:05 +03:00
stack72 10e8dd7964
Merge branch 'minamijoyo-add-iam-role-description' 2017-05-04 18:48:11 +03:00
stack72 fff5fed0f0
provider/aws: Change aws_iam_role description to not pass empty string 2017-05-04 18:46:36 +03:00
Radek Simko df26c5460c
docs: Add Maintainer's etiquette 2017-05-04 15:27:25 +01:00
Masayuki Morita 410fdad2cb provider/aws: Add support description to aws_iam_role
Fixes #14198
2017-05-04 23:11:20 +09:00
Annie Hedgpeth a9d5610a29 provider/azurerm: Add example of CDN with Storage Account (#14193)
* initial commit - 101-vm-from-user-image

* changed branch name

* not deploying - storage problems

* provisions vm but image not properly prepared

* storage not correct

* provisions properly

* changed main.tf to azuredeploy.tf

* added tfvars and info for README

* tfvars ignored and corrected file ext

* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing

* deploy.sh to be executable

* executable deploy files

* added CI files; changed vars

* prep for PR

* removal of old folder

* prep for PR

* wrong args for travis

* more PR prep

* updated README

* commented out variables in terraform.tfvars

* Topic 101 vm from user image (#2)

* initial commit - 101-vm-from-user-image
* added tfvars and info for README
* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing
* prep for PR

* added new template

* oops, left off master

* prep for PR

* correct repository for destination

* renamed scripts to be more intuitive; added check for docker

* merge vm simple; vm from image

* initial commit

* deploys locally

* updated deploy

* changed to allow http & https (like ARM tmplt)

* changed host_name & host_name variable desc

* prep for PR

* took out armviz button and minor README changes

* changed host_name

* fixed merge conflicts

* changed host_name variable

* updating Hashicorp's changes to merged simple linux branch

* updating files to merge w/master and prep for Hashicorp pr

* reverted to Hashicorp's .travis.yml

* terraform graph

* removing pending example

* cleaned up deploy.ci.sh
2017-05-04 14:28:04 +01:00
Annie Hedgpeth 8e7f3cc09d provider/azurerm: Add example of a VNET w/ Two Subnets (#14115)
* merge master

* added new constructs/naming for deploy scripts, etc.

* suppress az login output

* removed .tfvars and provider.tf; updated prev merge

* reverted .travis.yml back to Hashicorp's

* Reverting back to the Hashicorp travis file
2017-05-04 10:57:54 +01:00
Phil Clay 03c7cfb799 Fix docs for openstack lbaas v2 resource types. (#14196)
The documentation title/sidbar incorrectly referred to resource types `openstack_lbass_*` when the actual names are `openstack_lb_*`.
2017-05-04 09:19:09 +01:00
Payam Hekmat 3556004501 Add dockercfg example to Kubernetes secret (#14151) 2017-05-04 09:14:23 +01:00
Matthew Frahry bcf1514422 Merge pull request #14090 from hashicorp/p-aws-config-config-source-detail
provider/aws Added default to event source
2017-05-03 18:36:02 -06:00
Paul Thrasher 3bff3adc9e Update CHANGELOG.md 2017-05-03 17:02:28 -07:00
Paul Thrasher 9ad1425cf8 Merge pull request #14192 from hashicorp/thrashr888/aws_db_option_group-name-lowercase
provider/aws: aws_db_option_group normalizes name to lowercase
2017-05-03 17:00:16 -07:00
Paul Thrasher ccae9372e5 provider/aws: aws_db_option_group normalizes name to lowercase
This is a fix for PR #11040. The code here lowercases the name and/or prefix before sending it to the AWS API and the terraform state. This means the state will match the actual resource name and be able to converge the diff.
2017-05-03 16:50:40 -07:00
Paddy 8e69d75936 Merge branch 'master' into cloud_router 2017-05-03 16:00:13 -07:00
Paddy 1d45bb73f1 Update CHANGELOG.md 2017-05-03 15:55:46 -07:00
Paddy 7a73c21c11 Merge pull request #13824 from JDiPierro/import_google_dns_managed_zone
Importability for Google DNS Managed Zone
2017-05-03 15:54:43 -07:00
Paddy 2aaabf77ad Update CHANGELOG.md 2017-05-03 15:48:17 -07:00
Paddy dc63d8c42b Merge pull request #12482 from tpoindessous/gcp_compute_disk_snapshot
provider/google : add a new resource : google_compute_snapshot
2017-05-03 15:47:07 -07:00
Dana Hoffman 59e344f7c9 Update CHANGELOG.md 2017-05-03 14:31:35 -07:00
Dana Hoffman 39e25ca925 provider/google: fix compute instance panic with bad disk config (#14169) 2017-05-03 14:30:36 -07:00