Skip to content

Commit c62f6a8

Browse files
author
Lee Johnson
committed
Merge remote-tracking branch 'origin/master' into statuscake_adding_contact_group
2 parents 3ff9222 + f1f3c1d commit c62f6a8

7 files changed

Lines changed: 80 additions & 36 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## 0.8.0-rc2 (unreleased)
22

3+
BACKWARDS INCOMPATIBILITIES / NOTES:
4+
5+
* Strings in configuration can no longer contain unescaped newlines. For unescaped newlines, heredocs must be used.
6+
37
FEATURES:
48

59
* **New DataSource:** `aws_route_table` [GH-10301]
@@ -10,6 +14,7 @@ IMPROVEMENTS:
1014
* provider/azurerm: create common schema for location field, add diff suppress [GH-10409]
1115
* provider/github: supports importing resources [GH-10382]
1216
* provider/postgresql: Added 'connect_timeout' argument to provider 'postgresql' [GH-10380]
17+
* provider/cloudstack: Support using secondary IP addresses with the `cloudstack_static_nat` resource [GH-10420]
1318

1419
BUG FIXES:
1520

‎builtin/providers/cloudstack/resource_cloudstack_static_nat.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ func resourceCloudStackStaticNAT() *schema.Resource {
2323
ForceNew: true,
2424
},
2525

26-
"network_id": &schema.Schema{
27-
Type: schema.TypeString,
28-
Optional: true,
29-
ForceNew: true,
30-
Deprecated: "network_id is deprecated and can be safely omitted",
31-
},
32-
3326
"virtual_machine_id": &schema.Schema{
3427
Type: schema.TypeString,
3528
Required: true,
@@ -73,10 +66,18 @@ func resourceCloudStackStaticNATCreate(d *schema.ResourceData, meta interface{})
7366
p.SetVmguestip(vmGuestIP.(string))
7467

7568
// Set the network ID based on the guest IP, needed when the public IP address
76-
// is not associated with any network yet (VPC case)
69+
// is not associated with any network yet
70+
NICS:
7771
for _, nic := range vm.Nic {
7872
if vmGuestIP.(string) == nic.Ipaddress {
7973
p.SetNetworkid(nic.Networkid)
74+
break NICS
75+
}
76+
for _, ip := range nic.Secondaryip {
77+
if vmGuestIP.(string) == ip.Ipaddress {
78+
p.SetNetworkid(nic.Networkid)
79+
break NICS
80+
}
8081
}
8182
}
8283
} else {

‎vendor/github.com/hashicorp/hcl/hcl/scanner/scanner.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/vendor.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,68 +1514,68 @@
15141514
{
15151515
"checksumSHA1": "8OPDk+bKyRGJoKcS4QNw9F7dpE8=",
15161516
"path": "github.com/hashicorp/hcl",
1517-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1518-
"revisionTime": "2016-11-22T02:11:24Z"
1517+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1518+
"revisionTime": "2016-11-29T18:26:28Z"
15191519
},
15201520
{
15211521
"checksumSHA1": "XQmjDva9JCGGkIecOgwtBEMCJhU=",
15221522
"path": "github.com/hashicorp/hcl/hcl/ast",
1523-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1524-
"revisionTime": "2016-11-22T02:11:24Z"
1523+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1524+
"revisionTime": "2016-11-29T18:26:28Z"
15251525
},
15261526
{
15271527
"checksumSHA1": "5HVecyfmcTm6OTffEi6LGayQf5M=",
15281528
"path": "github.com/hashicorp/hcl/hcl/fmtcmd",
1529-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1530-
"revisionTime": "2016-11-22T02:11:24Z"
1529+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1530+
"revisionTime": "2016-11-29T18:26:28Z"
15311531
},
15321532
{
15331533
"checksumSHA1": "croNloscHsjX87X+4/cKOURf1EY=",
15341534
"path": "github.com/hashicorp/hcl/hcl/parser",
1535-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1536-
"revisionTime": "2016-11-22T02:11:24Z"
1535+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1536+
"revisionTime": "2016-11-29T18:26:28Z"
15371537
},
15381538
{
15391539
"checksumSHA1": "1k1PQRPdYEjeTbXsYz5ZP+Won1w=",
15401540
"path": "github.com/hashicorp/hcl/hcl/printer",
1541-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1542-
"revisionTime": "2016-11-22T02:11:24Z"
1541+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1542+
"revisionTime": "2016-11-29T18:26:28Z"
15431543
},
15441544
{
1545-
"checksumSHA1": "Zz4271B4Kc+rwwK7cbaRv7STfO8=",
1545+
"checksumSHA1": "z6wdP4mRw4GVjShkNHDaOWkbxS0=",
15461546
"path": "github.com/hashicorp/hcl/hcl/scanner",
1547-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1548-
"revisionTime": "2016-11-22T02:11:24Z"
1547+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1548+
"revisionTime": "2016-11-29T18:26:28Z"
15491549
},
15501550
{
1551-
"checksumSHA1": "/e0ULfQnGeUKiM1+iMnQhImo62k=",
1551+
"checksumSHA1": "oS3SCN9Wd6D8/LG0Yx1fu84a7gI=",
15521552
"path": "github.com/hashicorp/hcl/hcl/strconv",
1553-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1554-
"revisionTime": "2016-11-22T02:11:24Z"
1553+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1554+
"revisionTime": "2016-11-29T18:26:28Z"
15551555
},
15561556
{
15571557
"checksumSHA1": "c6yprzj06ASwCo18TtbbNNBHljA=",
15581558
"path": "github.com/hashicorp/hcl/hcl/token",
1559-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1560-
"revisionTime": "2016-11-22T02:11:24Z"
1559+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1560+
"revisionTime": "2016-11-29T18:26:28Z"
15611561
},
15621562
{
15631563
"checksumSHA1": "138aCV5n8n7tkGYMsMVQQnnLq+0=",
15641564
"path": "github.com/hashicorp/hcl/json/parser",
1565-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1566-
"revisionTime": "2016-11-22T02:11:24Z"
1565+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1566+
"revisionTime": "2016-11-29T18:26:28Z"
15671567
},
15681568
{
15691569
"checksumSHA1": "YdvFsNOMSWMLnY6fcliWQa0O5Fw=",
15701570
"path": "github.com/hashicorp/hcl/json/scanner",
1571-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1572-
"revisionTime": "2016-11-22T02:11:24Z"
1571+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1572+
"revisionTime": "2016-11-29T18:26:28Z"
15731573
},
15741574
{
15751575
"checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=",
15761576
"path": "github.com/hashicorp/hcl/json/token",
1577-
"revision": "7cb7455c285ca3bf3362aa4ba6a06a6d6f5c3ba0",
1578-
"revisionTime": "2016-11-22T02:11:24Z"
1577+
"revision": "5550aaba7896ad2a161888b40954bc0f0787bb81",
1578+
"revisionTime": "2016-11-29T18:26:28Z"
15791579
},
15801580
{
15811581
"checksumSHA1": "/TJCBetWCMVsOpehJzVk3S/xtWM=",

‎website/source/docs/providers/cloudstack/r/static_nat.html.markdown‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ The following arguments are supported:
2626
* `ip_address_id` - (Required) The public IP address ID for which static
2727
NAT will be enabled. Changing this forces a new resource to be created.
2828

29-
* `network_id` - (Deprecated) The network ID of the VM the static NAT will be
30-
enabled for. This argument is no longer needed and can be safely omitted.
31-
3229
* `virtual_machine_id` - (Required) The virtual machine ID to enable the
3330
static NAT feature for. Changing this forces a new resource to be created.
3431

‎website/source/upgrade-guides/0-8.html.markdown‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,40 @@ list of changes will always be the
2323
After reviewing this guide, we recommend reviewing the Changelog to check on
2424
specific notes about the resources and providers you use.
2525

26+
## Newlines in Strings
27+
28+
Newlines are no longer allowed in strings unless it is a heredoc or an
29+
interpolation. This improves the performance of IDE syntax highlighting
30+
of Terraform configurations and simplifies parsing.
31+
32+
**Behavior that no longer works in Terraform 0.8:**
33+
34+
```
35+
resource "null_resource" "foo" {
36+
value = "foo
37+
bar"
38+
}
39+
```
40+
41+
**Valid Terraform 0.8 configuration:**
42+
43+
```
44+
resource "null_resource" "foo" {
45+
value = "foo\nbar"
46+
47+
value2 = <<EOF
48+
foo
49+
bar
50+
EOF
51+
52+
# You can still have newlines within interpolations.
53+
value3 = "${lookup(
54+
var.foo, var.bar)}"
55+
}
56+
```
57+
58+
**Action:** Use heredocs or escape sequences when you have a string with newlines.
59+
2660
## Math Order of Operations
2761

2862
Math operations now follow standard mathematical order of operations.

0 commit comments

Comments
 (0)