Commit Graph

11553 Commits

Author SHA1 Message Date
Joe Topjian
af26350f49 Update CHANGELOG.md 2016-07-20 08:24:32 -06:00
Joe Topjian
30273faf20 Merge pull request #7649 from jtopjian/openstack-boot-volume-fix
provider/openstack: Fixing boot volume interference
2016-07-20 08:23:09 -06:00
James Bardin
8dcbc0b0a0 Add concat to accept lists of lists and maps
This will allow the concat interpolation function to accept lists of
lists, and lists of maps as well as strings. We still allow bare strings
for backwards compatibility, but remove some of the old comment wording
as it could cause confusion of this function with actual string
concatenation.

Since maps are now supported in the config, this removes the superfluous
(and failing) TestInterpolationFuncConcatListOfMaps.
2016-07-19 17:45:50 -04:00
James Bardin
2bd7cfd5fe Expand list interpolation to lists and maps
Allow lists and maps within the list interpolation function via variable
interpolation. Since this requires setting the variadic type to TypeAny,
we check for non-heterogeneous lists in the callback.
2016-07-19 13:44:37 -04:00
Paul Stack
2559c19c8d Website: Adding an import section to the bottom of the page of importable resources (#7703)
* docs/digitalocean: Adding an import section to the bottom of the DO
importable resources

* docs/azurerm: Adding the Import sections for the AzureRM Importable resources

* docs/aws: Adding the import sections to the AWS provider pages
2016-07-19 17:22:30 +01:00
Paul Hinze
e1c3eba144 Update CHANGELOG.md 2016-07-19 09:29:05 -05:00
Paul Hinze
62ec69a66a Merge pull request #7669 from kwilczynski/fix/aws-network-acl-rule
Fix icmp_type and icmp_code in aws_network_acl_rule.
2016-07-19 09:27:42 -05:00
stack72
a44573140b
Merge branch 'master' of github.com:hashicorp/terraform 2016-07-19 09:36:32 +01:00
stack72
fadfea45f4
Website: Change the link to AzureRM ScaleSets as the link was throwing a 404 2016-07-19 09:36:24 +01:00
avichalbadaya
7369c1c9f4 Allowing ap-south-1 (Mumbai) as valid AWS region (#7688)
* Update website_endpoint_url_test.go

Allow ap-south-1 (Mumbai) as valid region

* Update hosted_zones.go

Allowing ap-south-1 (Mumbai) as valid region

* Update website_endpoint_url_test.go

reformatting

* Update hosted_zones.go

reformatting

* Update resource_aws_s3_bucket.go

making changes for ap-south-1 (Mumbai) region
2016-07-19 09:01:49 +01:00
Paul Stack
565733398d provider/aws: Support Import of aws_cloudwatch_metric_alarm (#7687)
```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSCloudWatchMetricAlarm_'
==> 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=TestAccAWSCloudWatchMetricAlarm_ -timeout 120m
=== RUN   TestAccAWSCloudWatchMetricAlarm_importBasic
--- PASS: TestAccAWSCloudWatchMetricAlarm_importBasic (17.82s)
=== RUN   TestAccAWSCloudWatchMetricAlarm_basic
--- PASS: TestAccAWSCloudWatchMetricAlarm_basic (17.11s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    34.957s
```
2016-07-19 05:52:02 +02:00
James Nugent
58dd41f3b1 core: Add list() interpolation function
The list() interpolation function provides a way to add support for list
literals (of strings) to HIL without having to invent new syntax for it
and modify the HIL parser.

It presents as a function, thus:

    - list() -> []
    - list("a") -> ["a"]
    - list("a", "b") -> ["a", "b"]

Thanks to @wr0ngway for the idea of this approach, fixes #7460.
2016-07-18 18:12:11 -04:00
James Nugent
1cf1b5c9d6 Merge pull request #7689 from hashicorp/f-variables-as-complex-types
core: Convert context vars to map[string]interface{}
2016-07-18 13:50:17 -05:00
James Nugent
3735140286 core: Don't set variables for Atlas until lib is updated 2016-07-18 13:10:33 -05:00
James Nugent
5d18f41f04 core: Convert context vars to map[string]interface{}
This is the first step in allowing overrides of map and list variables.
We convert Context.variables to map[string]interface{} from
map[string]string and fix up all the call sites.
2016-07-18 13:02:54 -05:00
Paul Stack
d4e8616a9c Update CHANGELOG.md 2016-07-18 14:40:22 +01:00
Radek Simko
37b6ab4507 provider/aws: Bump rds_cluster timeout to 15 mins (#7604) 2016-07-18 14:39:51 +01:00
stack72
a04e336ef9
Merge branch 'master' of github.com:hashicorp/terraform 2016-07-18 13:34:17 +01:00
stack72
1c07582990
Merge branch 'macheins-empty-name-in-aws-route53-records' 2016-07-18 13:26:13 +01:00
stack72
8a72bfa5a9
provider/aws: Fix the Destroy func in the Route53 record tests
The test didn't expand the record name - therefore, when the name was
empty, it wasn't setting it to the domain name (like the normal resource
does!) This was causing an error
2016-07-18 13:25:42 +01:00
macheins
aabb200f2d
Allow empty names in aws_route53_record
Added test for aws_route53_record with empty name

Integrated test for aws_route53_record with empty name

Changed test to use a third-level domain for zone
2016-07-18 13:25:38 +01:00
Radek Simko
8b11bc0581 Update CHANGELOG.md 2016-07-18 14:16:15 +02:00
David Kelly
08291afd97 Increased lambda event mapping creation timeout (#7657)
Increased the retry timeout from 1 to 5 minutes due to the time for IAM permission propagation
2016-07-18 14:14:35 +02:00
Paul Stack
14d82af73a Update CHANGELOG.md 2016-07-18 11:39:53 +01:00
David Harris
05aef0e660 provider/aws: Support ec2-classic and vpc in beanstalk recurring plans. (#6491)
* provider/aws: Support ec2-classic and vpc

Fix Elastic Beanstalk recurring plans when additional security groups
are supplied. In the previous version, only non-default vpc security
groups would be handled by dropGeneratedSecurityGroup.

* provider/aws: Elastic Beanstalk VPC Test
2016-07-18 11:37:37 +01:00
Paul Stack
0abf0b2666 website: Scaleway Documentation (#7685)
Scaleway wasn't added to the
`website/source/assets/stylesheets/_docs.scss` file
2016-07-18 10:44:27 +01:00
Steven Eschinger
9c095d66e1 azurerm: fix vault_certificates in vm/scale_set (#7681)
When setting the certificate_url and certificate_store values in
os_profile_secrets / vault_certificates for a Windows VM in AzureRM, I
was getting the following error:

```
[DEBUG] Error setting Virtual Machine Storage OS Profile Secrets:
&errors.errorString{s:"Invalid address to set:
[]string{\"os_profile_secrets\", \"0\", \"vault_certificates\"}"}
```

This seems to resolve the issue.
2016-07-18 10:20:18 +01:00
Raphael Randschau
697828f81f Handle Scaleway tags correctly (#7682) 2016-07-18 10:12:15 +01:00
Matthew Clarke
9dbf998d23 Update aws api gateway docs to add some examples (#7586)
* added aws api gateway docs request parameter examples; fixed deployment example

* update aws api gw deployment docs to add depends on
2016-07-18 10:37:39 +02:00
Krzysztof Wilczynski
96b6a3dcb8
Add note about setting wildcard icmp_type.
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-07-17 03:34:32 +09:00
Krzysztof Wilczynski
6dd0e3f6db
Add validation for icmp_type and icmp_code.
Also, change order of processing to parse icmp_type first. Change wording of the
debug messages, and change format string type for rule_number where appropriate.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-07-17 03:24:48 +09:00
Radek Simko
b8d21330a7 provider/aws: Allow importing lambda_function (#7610) 2016-07-16 15:36:28 +01:00
stack72
6468b899b9
provider/aws: Fix the AMI ID in the test for VPC Classic Link 2016-07-16 15:17:37 +01:00
Paul Stack
bcef828a20 Update CHANGELOG.md 2016-07-16 15:14:48 +01:00
Andrew Sy Kim
e85297f958 provider/aws: Allow VPC Classic Linking in Autoscaling Launch Configs (#7470)
* support for vpc linking ec2 instances in launch configs

* add acceptance testing

* generate vpc and security groups for each test run
2016-07-16 15:13:29 +01:00
David Harris
03157610d8 provider/aws: Read Elastic Beanstalk stack name (#7671) 2016-07-16 14:43:12 +01:00
Paul Stack
28561bd064 Update CHANGELOG.md 2016-07-16 14:37:41 +01:00
shanoor
d9e3beb276 azurerm_storage_account now returns storage keys value instead of their names (#7674) 2016-07-16 14:36:15 +01:00
Paul Hinze
bb51834a4d
scripts/dist.sh: tweaks for recent hc-releases 2016-07-15 18:38:47 -06:00
Paul Hinze
7c40c174ef
clean up after v0.7.0-rc3 2016-07-15 18:33:02 -06:00
Paul Hinze
3f4857a07a
v0.7.0-rc3 2016-07-15 22:29:21 +00:00
Paul Hinze
2a036ba4f6 Merge pull request #7648 from hashicorp/phinze/GH-7378
dag: fix ReverseDepthFirstWalk when nodes remove themselves
2016-07-15 13:54:57 -06:00
Paul Hinze
b45f53eef4
dag: fix ReverseDepthFirstWalk when nodes remove themselves
The report in #7378 led us into a deep rabbit hole that turned out to
expose a bug in the graph walk implementation being used by the
`NoopTransformer`. The problem ended up being when two nodes in a single
dependency chain both reported `Noop() -> true` and needed to be
removed. This was breaking the walk and preventing the second node from
ever being visited.

Fixes #7378
2016-07-15 13:43:28 -06:00
Paul Hinze
a4c96e5619
dag: Fix graph printing type mismatch
Dependencies were being sorted, but their types were not, causing
incorrect printing.
2016-07-15 13:42:08 -06:00
Paul Hinze
71932138b9 Merge pull request #7667 from hashicorp/phinze/skip-final-snapshot-import
provider/aws: Fixup skip_final_snapshot import
2016-07-15 13:34:37 -06:00
Paul Hinze
614806d59f
helper/resource: Fix import test harness, which was modifying state
Maps are reference types, it turns out :D
2016-07-15 13:15:47 -06:00
David Harris
bbe7fd2613 provider/aws: Fix Elastic Beanstalk test (#7668)
This fixes the `TestAccAWSBeanstalkEnv_tier` test. The instance profile
needs access to send and receive messages from its sqs queue. Without
these permissions Beanstalk returns an error event, causing the test to
fail.
2016-07-15 20:03:42 +01:00
Krzysztof Wilczynski
81003fa6b1
Fix icmp_type and icmp_code in aws_network_acl_rule.
The ICMP type 0 (Echo Reply) was not handled correctly. This commit changes the
type of attributes "icmp_type" and "icmp_code" from TypeInt to TypeString,
allowing for the string value to be manually converted into an integer. This
enables an integer values such as -1, 0, 8, etc., coming from the resource
definition in the template to be handled correctly.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-07-16 03:28:09 +09:00
Paul Hinze
93832527b1
provider/aws: Fixup skip_final_snapshot import
Neither skip_final_snapshot nor final_snapshot_identifier can be fetched
from any API call, so we need to default skip_final_snapshot to true
during import so that final_snapshot_identifier is not required
2016-07-15 11:30:33 -06:00
Paul Hinze
ddffb47492 Update CHANGELOG.md 2016-07-15 09:49:07 -06:00