3878b8b093
config: Merge respects Terraform blocks, provider aliases, and more
...
Fixes #10715
`config.Merge` was not updated to support a number of new features. This
updates the codepath to merge various fields, including the `terraform`
block which was the issue in #10715 .
The `Merge` API is called when an `_override` file is present to _merge_
configurations. Normally configurations are _appended_. Only an override
file triggers a _merge_.
I started working on a generic library to do this automatically awhile
back but never finished it. This might motivate me to do so. In the
interest of getting a fix out though, we'll continue the manual
approach.
2016-12-13 21:48:59 -08:00
014b414839
website: fix upgrade guide link
2016-12-13 15:17:48 -08:00
29c9914130
Update CHANGELOG.md
2016-12-13 16:55:12 -06:00
56b0e87f5e
Merge pull request #10704 from Ninir/r-aws-sns_topic-protocols
...
provider/aws: Improved the SNS topic subscription protocols validation
2016-12-13 16:54:21 -06:00
a9f88ba6e4
Fix a couple of missing links ( #10708 )
2016-12-13 22:07:12 +00:00
e6429900ba
Update the nav to include a link to the `postgresql_schema` resource.
2016-12-13 12:26:34 -08:00
66348e518b
website: 0.8 is released
2016-12-13 11:55:06 -08:00
03f3b54a92
Merge branch 'master' of github.com:hashicorp/terraform
2016-12-13 19:29:33 +00:00
9aebe3344a
provider/google: Moving the XPN EnvVar check into provider_test.go to stop failed build
2016-12-13 19:29:23 +00:00
8275afab95
Update CHANGELOG.md
2016-12-13 19:18:37 +00:00
4f256a54db
Merge branch 'google-xpn' of https://github.com/danawillow/terraform
2016-12-13 19:15:54 +00:00
60658fdfbc
Merge pull request #10707 from hashicorp/b-postgresql-schema-auth
...
Dept of second thoughts: remove authorization support ASAP.
2016-12-13 10:45:19 -08:00
56a193f228
Dept of second thoughts: remove authorization support before 0.8
...
releases.
When postgresql_schema_policy lands this attribute should be removed in
order to provide a single way of accomplishing setting permissions on
schema objects.
2016-12-13 10:28:06 -08:00
a04ce1d09a
release: clean up after v0.8.0
2016-12-13 18:20:33 +00:00
142dd256ad
v0.8.0
2016-12-13 18:16:00 +00:00
d7b9c1a209
update CHANGELOG
2016-12-13 09:47:50 -08:00
8c85cc1e0e
update CHANGELOG
2016-12-13 09:47:21 -08:00
e32a7377f3
update CHANGELOG
2016-12-13 09:45:33 -08:00
99be2d3280
provider/aws: Improved the SNS topic subscription protocols validation
2016-12-13 17:54:52 +01:00
47e756cd97
Merge pull request #10690 from hashicorp/b-x-module-target
...
terraform: TargetsTransformer should preserve module variables
2016-12-13 08:31:28 -08:00
e86289f008
Update CHANGELOG.md
2016-12-13 16:23:06 +00:00
3239138099
provider/aws: data source for AWS Hosted Zone ( #9766 )
...
* provider/aws: data source for AWS Hosted Zone
* add caller_reference, resource_record_set_count fields, manage private zone and trailing dot
* fix fmt
* update documentation, use string function in hostedZoneNamewq
* add vpc_id support
* add tags support
* add documentation for hosted zone data source tags support
2016-12-13 16:22:26 +00:00
b2136beff2
Merge pull request #10702 from hashicorp/pr-10694
...
provider/aws: Save `iam_access_key` secret to state if no PGP key given (supersedes #10694 )
2016-12-13 10:11:07 -06:00
72885c6736
provider/aws: Save secret to state in iam_access_key if pgp key not found
2016-12-13 09:32:04 -06:00
67b638378c
correct `rootPath` ( #10700 )
...
This previously referenced `github.com/lrsmith/terraform`
Fixes issue #10699
2016-12-13 15:07:06 +00:00
850c664c0c
Update CHANGELOG.md
2016-12-13 12:13:55 +00:00
a5e7bbac43
Update CHANGELOG.md
2016-12-13 12:10:40 +00:00
73213793ca
provider/aws: Add aws_eip data source ( #9833 )
...
* provider/aws: Add the aws_eip data source
* Document the aws_eip data source on the website
* provider/aws: support query by public_ip for aws_eip data source
2016-12-13 12:09:21 +00:00
e58bb9d824
Update CHANGELOG.md
2016-12-13 12:01:29 +00:00
88faa1bb7f
Improving Rundeck provider: scheduler ( #9449 )
...
* feat(rundeck provider): Scheduling (crontab)
* fix(govendor-upgrade): Rundeck api wrapper
2016-12-13 12:00:53 +00:00
e558cbddf4
provider/rundeck: Set Computed on rundeck_job preserve_options_order ( #10695 )
...
Before the change, this was the test result:
```
% make testacc TEST=./builtin/providers/rundeck 2 ↵
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/12/13 11:14:11 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/rundeck -v -timeout 120m
=== RUN TestProvider
--- PASS: TestProvider (0.00s)
=== RUN TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN TestAccJob_basic
--- FAIL: TestAccJob_basic (6.51s)
testing.go:265: Step 0 error: After applying this step, the plan was not empty:
DIFF:
UPDATE: rundeck_job.test
preserve_options_order: "true" => "false"
STATE:
rundeck_job.test:
ID = 1da079e6-31f1-4c77-9cbb-c77c0a16fea5
allow_concurrent_executions = true
command.# = 1
command.0.inline_script =
command.0.job.# = 0
command.0.node_step_plugin.# = 0
command.0.script_file =
command.0.script_file_args =
command.0.shell_command = echo Hello World
command.0.step_plugin.# = 0
command_ordering_strategy = node-first
continue_on_error = false
description = A basic job
group_name =
log_level = INFO
max_thread_count = 1
name = basic-job
node_filter_exclude_precedence = false
node_filter_query = example
option.# = 1
option.0.allow_multiple_values = false
option.0.default_value = bar
option.0.description =
option.0.exposed_to_scripts = false
option.0.multi_value_delimiter =
option.0.name = foo
option.0.obscure_input = false
option.0.require_predefined_choice = false
option.0.required = false
option.0.validation_regex =
option.0.value_choices.# = 0
option.0.value_choices_url =
preserve_options_order = true
project_name = terraform-acc-test-job
rank_attribute =
rank_order = ascending
Dependencies:
rundeck_project.test
rundeck_project.test:
ID = terraform-acc-test-job
default_node_executor_plugin = jsch-ssh
default_node_file_copier_plugin = jsch-scp
description = parent project for job acceptance tests
extra_config.% = 0
name = terraform-acc-test-job
resource_model_source.# = 1
resource_model_source.0.config.% = 2
resource_model_source.0.config.file = /tmp/terraform-acc-tests.xml
resource_model_source.0.config.format = resourcexml
resource_model_source.0.type = file
ssh_authentication_type = privateKey
ssh_key_file_path =
ssh_key_storage_path =
ui_url = http://192.168.50.2:4440/api/18/project/terraform-acc-test-job
=== RUN TestAccPrivateKey_basic
--- PASS: TestAccPrivateKey_basic (7.90s)
=== RUN TestAccProject_basic
--- PASS: TestAccProject_basic (2.21s)
=== RUN TestAccPublicKey_basic
--- PASS: TestAccPublicKey_basic (2.43s)
FAIL
exit status 1
FAIL github.com/hashicorp/terraform/builtin/providers/rundeck 19.067s
make: *** [testacc] Error 1
```
After the change:
```
% make testacc TEST=./builtin/providers/rundeck 2 ↵
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/12/13 11:35:46 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/rundeck -v -timeout 120m
=== RUN TestProvider
--- PASS: TestProvider (0.00s)
=== RUN TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN TestAccJob_basic
--- PASS: TestAccJob_basic (1.46s)
=== RUN TestAccPrivateKey_basic
--- PASS: TestAccPrivateKey_basic (0.26s)
=== RUN TestAccProject_basic
--- PASS: TestAccProject_basic (0.65s)
=== RUN TestAccPublicKey_basic
--- PASS: TestAccPublicKey_basic (0.59s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/rundeck 2.975s
```
2016-12-13 11:42:26 +00:00
329381585d
Update CHANGELOG.md
2016-12-13 11:41:15 +00:00
a60a3764f2
provider/rundeck) enable validation for multiple values in an array ( #8913 )
2016-12-13 11:40:31 +00:00
49cdb64426
Update CHANGELOG.md
2016-12-13 10:41:11 +00:00
d3633398a7
provider/aws Add aws_vpc_endpoint_service data source ( #10261 )
...
* provider/aws Add aws_vpc_endpoint_services data source.
* Rename 'aws_vpc_endpoint_services' to 'aws_vpc_endpoint_service'.
2016-12-13 10:40:35 +00:00
3ceee01e9f
Update CHANGELOG.md
2016-12-13 10:38:53 +00:00
0134315148
enable DeleteOnTermination ( #9922 )
2016-12-13 10:38:05 +00:00
3ab5c630bd
Don't remove secret, just deprecate it
2016-12-13 11:31:32 +01:00
04812b60d2
Fix 404 on API link ( #10693 )
2016-12-13 10:12:49 +00:00
5f1e6ad020
terraform: TargetsTransformer should preserve module variables
...
Fixes #10680
This moves TargetsTransformer to run after the transforms that add
module variables is run. This makes targeting work across modules (test
added).
This is a bug that only exists in the new graph, but was caught by a
shadow error in #10680 . Tests were added to protect against regressions.
2016-12-12 20:59:14 -08:00
a8c6809ec3
Update CHANGELOG.md
2016-12-12 16:41:11 -08:00
a08d562abf
Merge pull request #10684 from cblecker/gcp-ssl-cert-name-prefix
...
Add support for name_prefix to google_compute_ssl_certificate
2016-12-12 16:40:07 -08:00
fa8921f8f4
Add support for name_prefix to google_compute_ssl_certificate
2016-12-12 15:57:58 -08:00
afa0591f6a
Update CHANGELOG.md
2016-12-12 15:27:06 -08:00
7cda9e8c74
Merge pull request #10682 from hashicorp/f-fixup-postgresql
...
Various changes to the PostgreSQL provider
2016-12-12 15:22:53 -08:00
ce60c4fede
gofmt cleanup on imports.
2016-12-12 15:21:20 -08:00
2ecd42c0be
Remove non-standard environment variables in prep for 0.8.
2016-12-12 15:21:00 -08:00
6ed37770c3
Add the testing Makefile that I'm using for testing the provider locally.
2016-12-12 14:44:46 -08:00
8c41f0859b
Add the version attribute to postgresql_extension.
2016-12-12 14:37:40 -08:00
d75d5bc83d
Update CHANGELOG.md
2016-12-12 22:35:16 +00:00
Mitchell Hashimoto