Commit Graph

11687 Commits

Author SHA1 Message Date
James Bardin
67bd4f29e0 Override atlas variables even if they aren't local
Some Atlas usage patterns expect to be able to override a variable set
in Atlas, even if it's not seen in the local context. This allows
overwriting a variable that is returned from atlas, and sends it back.

Also use a unique sential value in the context where we have variables
from atlas. This way atals variables aren't combined with the local
variables, and we don't do something like inadvertantly change the type,
double encode/escape, etc.
2016-08-04 17:26:41 -04:00
Radek Simko
98d8440711 docs/aws: Fix ordering of data sources (#7970) 2016-08-04 09:40:45 +01:00
Sam Stavinoha
a0fc4276ba remove duplicate 'recipients' argument (#7968) 2016-08-04 07:47:12 +01:00
Evan Brown
89df636163 Merge pull request #7852 from gaker/google-provider-backend-cdn
google_compute_backend_service "enable_cdn"
2016-08-03 20:11:54 -07:00
James Nugent
4b6eea8593 Merge pull request #7945 from kylewest/patch-1
fix awkward wording of atlas token generation
2016-08-03 14:26:22 -07:00
James Nugent
b33871d966 Merge pull request #7954 from ehmo/patch-1
typo
2016-08-03 14:25:37 -07:00
Rasty Turek
96d88f1714 typo 2016-08-03 13:44:52 -07:00
Krzysztof Wilczynski
ec7ff802b6 Fix link to the remote state link post 0.7.x. (#7946)
* Fix link to the remote state link post 0.7.x.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>

* Correct "resource" to "data source".

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-08-03 19:45:14 +01:00
Cecchi MacNaughton
8d9a9ddebe Correct typo in length() documentation (#7947) 2016-08-03 18:48:00 +01:00
Kyle West
c584287cf9 fix awkward wording of atlas token generation
Too many "to"s (and other prepositions) made this hard to skim.
2016-08-03 10:54:25 -04:00
James Nugent
5320a54831 Merge pull request #7944 from grayaii/master
Increase timeout yet again for aws elasticsearch resource
2016-08-03 07:49:31 -07:00
grayaii
cb5062d237 Increase timeout yet again for aws elasticsearch resource
We create hundreds of AWS Elasticsearch resources over the last few months and we get occasional timeout failures from AWS.  This will PR is to increase the timeout once again. I did it before:
https://github.com/hashicorp/terraform/pull/5910/files
But we've seen enough timeouts from AWS on this resource that increasing the timeout seems like the only solution.
2016-08-03 16:39:28 +02:00
James Nugent
c34cfec14a Merge pull request #7933 from hashicorp/resource-import-list
website/docs: Adding a list of resources that are available to import now
2016-08-03 07:16:56 -07:00
James Nugent
581f23dfa0 docs: Tidy up importabable resources list 2016-08-03 07:15:26 -07:00
James Nugent
7fa0f24c9d Merge pull request #7940 from jasonamyers/patch-1
Update ecs_task_definition.html.markdown
2016-08-03 07:11:10 -07:00
Martin Atkins
5f85d3f4c4 Merge #7941: Fix terraform_remote_state documentation 2016-08-03 06:52:50 -07:00
Dan Webb
8e6dd97eba Fix terraform_remote_state documentation
Fixing minor typo to match documentation on https://www.terraform.io/docs/providers/terraform/d/remote_state.html
2016-08-03 14:07:57 +01:00
Jason Myers
f335c5fa91 Update ecs_task_definition.html.markdown
Add a note about the recently added task_role_arn argument.
2016-08-03 07:51:41 -05:00
James Nugent
395c6d2df0 Merge pull request #7857 from hashicorp/bump-aws-sdk-1.2.10
provider/aws: Bump SDK package version to v1.2.10
2016-08-03 00:04:09 -07:00
stack72
9a4c0c2455
docs/aws: Clarifying that needs the ARN of the IAM Role not the ID 2016-08-03 13:24:54 +10:00
stack72
6c35953994
website/docs: Adding a list of resources that are available to import now 2016-08-03 13:18:36 +10:00
Paul Hinze
70f43ac8dc
website: fix community page typo 2016-08-02 20:00:02 -05:00
Paul Hinze
3dcee8fb18 Merge pull request #7921 from hashicorp/f-people
website: update community people section
2016-08-02 16:12:12 -05:00
Paul Hinze
ab30753498
website: update community people section
As the page says:

> Over time, faces may appear from this list as contributors come and
> go.

Let's reflect the list of peoople working on Terraform nowadays! :)
2016-08-02 16:03:02 -05:00
Paul Hinze
79f2f229b1
website: add listmap anchor to upgrade guide
linked from blog post
2016-08-02 14:13:25 -05:00
Paul Stack
9306e29651 docs/website: Linking the downloads page to the upgrade guide for 0.7 (#7913) 2016-08-03 05:06:44 +10:00
James Nugent
fa64ac7815 release: clean up after v0.7.0 2016-08-02 18:17:05 +00:00
James Nugent
e822a79165
v0.7.0 2016-08-02 17:59:44 +00:00
James Bardin
9a0e18e640 Merge pull request #7900 from hashicorp/d-upgrade-guide
website: v0.7 Upgrade Guide
2016-08-02 13:27:22 -04:00
James Bardin
e1532738e6 Minor fixups
Some spelling and working fixes.

Added mention of deprecation warning to exisiting data sources as
resources.

Mention `~/.terraform.d` for old builtin plugin location

Added mention of `terraform.tfvars` and `-var-file` in map value
overrides.
2016-08-02 11:20:53 -04:00
James Bardin
81bb6b7264 Merge pull request #7905 from hashicorp/jbardin/merge
core: Add merge interpolation function
2016-08-02 09:45:20 -04:00
James Bardin
2a11f3a138 make variadic syntax consistent in docs 2016-08-02 09:34:29 -04:00
James Bardin
068059ab3f Add merge doc 2016-08-02 09:33:08 -04:00
James Nugent
754d97f68b Merge pull request #7903 from hashicorp/jbardin/logging
Silence log output during tests when not verbose
2016-08-01 21:31:00 -07:00
James Nugent
6bd3712f03 Merge pull request #7895 from hashicorp/import-aws-dbsg
provider/aws: Support Import of `aws_db_security_group`
2016-08-01 19:44:15 -05:00
James Nugent
acb6fb5422 Merge pull request #7896 from hashicorp/import-aws-redshiftsg
provider/aws: Support Import of `aws_redshift_security_group`
2016-08-01 19:43:27 -05:00
Paul Stack
c42121b6c0 Update CHANGELOG.md 2016-08-02 09:57:22 +10:00
James Nugent
f76c1ec921 provider/aws: Fix aws_route53_record 0-2 migration (#7907)
When migrating the state of an `aws_route53_record`, a v0 state was
never upgraded to v2, and a typo in a unit test masked this. This commit
fixes the migration by chaining the invocation of the migration
function, and corrects the test.
2016-08-02 09:54:17 +10:00
James Nugent
0e36c130df docs: Add lists and map overrides to upgrade guide 2016-08-01 18:28:13 -05:00
James Bardin
39bbbb8da6 Add merge interpolation function
Add a `merge` interpolation function, which merges any number of maps.
Duplicate keys are OK, with the last write winning.
2016-08-01 18:30:58 -04:00
James Bardin
1af7ee87a2 Silence log output when not verbose
Set the default log package output to iotuil.Discard during tests if the
`-v` flag isn't set. If we are verbose, then apply the filter according
to the TF_LOG env variable.
2016-08-01 17:19:14 -04:00
Paul Hinze
8c48fb94a5
website: v0.7 Upgrade Guide 2016-08-01 14:40:16 -05:00
James Bardin
8c4b4edd2f Merge pull request #7899 from hashicorp/jbardin/concat
core: Disallow strings as arguments to concat
2016-08-01 15:34:47 -04:00
James Bardin
c9e1522103 Use HIL to limit concat to ast.TypeList
we can remove some type checks in the concat function
2016-08-01 15:24:18 -04:00
James Bardin
c15c0eb0cb Disallow strings as arguments to concat
The concat interpolation function now only accepts list arguments.
Strings are no longer supported, for concatenation or appending to
lists. All arguments must be a list, and single elements can be promoted
with the `list` interpolation function.
2016-08-01 15:06:20 -04:00
stack72
8bb7e619b5
provider/aws: Support Import of aws_redshift_security_group
```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSRedshiftSecurityGroup_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v
-run=TestAccAWSRedshiftSecurityGroup_ -timeout 120m
=== RUN   TestAccAWSRedshiftSecurityGroup_importBasic
--- PASS: TestAccAWSRedshiftSecurityGroup_importBasic (30.87s)
=== RUN   TestAccAWSRedshiftSecurityGroup_ingressCidr
--- PASS: TestAccAWSRedshiftSecurityGroup_ingressCidr (30.45s)
=== RUN   TestAccAWSRedshiftSecurityGroup_updateIngressCidr
--- PASS: TestAccAWSRedshiftSecurityGroup_updateIngressCidr (72.78s)
=== RUN   TestAccAWSRedshiftSecurityGroup_ingressSecurityGroup
--- PASS: TestAccAWSRedshiftSecurityGroup_ingressSecurityGroup (49.73s)
=== RUN   TestAccAWSRedshiftSecurityGroup_updateIngressSecurityGroup
--- PASS: TestAccAWSRedshiftSecurityGroup_updateIngressSecurityGroup
(92.44s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    276.291s
```
2016-08-02 02:03:43 +10:00
stack72
91596b4a71
provider/aws: Support Import of aws_db_security_group
This test overrides the AWS_DEFAULT_REGION parameter as the security
groups are created in us-east-1 (due to classic VPC requirements)

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSDBSecurityGroup_importBasic'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v
-run=TestAccAWSDBSecurityGroup_importBasic -timeout 120m
=== RUN   TestAccAWSDBSecurityGroup_importBasic
--- PASS: TestAccAWSDBSecurityGroup_importBasic (49.46s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    49.487s
```
2016-08-02 01:42:54 +10:00
Paul Stack
d85007b55a Update CHANGELOG.md 2016-08-01 08:50:34 +10:00
Peter McAtominey
cc18e4d7ca provider/azurerm: add traffic manager resources (#7826)
* provider/azurerm: vendor arm/trafficmanager package

* provider/azurerm: add azurerm_traffic_manager_profile resource

* provider/azurerm: add azurerm_traffic_manager_endpoint resource

* provider/azurerm: document traffic manager resources

* provider/azurerm: use short type argument for traffic manager endpoint

The resource now takes the short type for example azureEndpoints instead of the
long form Microsoft.Network/TrafficManagerProfiles/azureEndpoints.

```
TF_ACC=1 go test ./builtin/providers/azurerm -v -run TestAccAzureRMTrafficManagerEndpoint -timeout 120m
=== RUN   TestAccAzureRMTrafficManagerEndpoint_basic
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basic (179.72s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal (171.36s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_updateWeight
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updateWeight (167.24s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_updatePriority
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updatePriority (192.91s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints
--- PASS: TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints (111.18s)
PASS
ok   github.com/hashicorp/terraform/builtin/providers/azurerm    822.534s
```

* provider/azurerm: remove unnecesary dereferences in traffic manager resources

```
TF_ACC=1 go test ./builtin/providers/azurerm -v -run TestAccAzureRMTrafficManager -timeout 120m
=== RUN   TestAccAzureRMTrafficManagerEndpoint_basic
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basic (176.08s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal (172.28s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_updateWeight
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updateWeight (148.97s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_updatePriority
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updatePriority (101.18s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints
--- PASS: TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints (88.33s)
=== RUN   TestAccAzureRMTrafficManagerProfile_weighted
--- PASS: TestAccAzureRMTrafficManagerProfile_weighted (80.92s)
=== RUN   TestAccAzureRMTrafficManagerProfile_performance
--- PASS: TestAccAzureRMTrafficManagerProfile_performance (82.98s)
=== RUN   TestAccAzureRMTrafficManagerProfile_priority
--- PASS: TestAccAzureRMTrafficManagerProfile_priority (81.07s)
=== RUN   TestAccAzureRMTrafficManagerProfile_withTags
--- PASS: TestAccAzureRMTrafficManagerProfile_withTags (102.50s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/azurerm	1034.458s
```
2016-07-31 23:46:15 +01:00
Milad Irannejad
802f014d60 Update doc page for aws_elb (#7882) 2016-07-31 23:44:21 +01:00