From 9a6c4a0d6ff844b021393afe28aeac87adc3aa49 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 21 Mar 2016 14:02:10 +0000 Subject: [PATCH 1/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae70affe8e3..4b6993678dcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ BUG FIXES: * core: Modules sourced from a Mercurial repository now work correctly on Windows [GH-5739] * provider/aws: Fix crash when an `aws_rds_cluster_instance` is removed outside of Terraform [GH-5717] * provider/aws: `aws_lambda_function` resources no longer error on refresh if deleted externally to Terraform [GH-5668] + * provider/aws: `aws_vpn_connection` resources deleted via the console on longer cause a crash [GH-5747] * provider/google: Default description `google_dns_managed_zone` resources to "Managed By Terraform" [GH-5428] * provider/google: Fix error message on invalid instance URL for `google_compute_instance_group` [GH-5715] From fed666a5b67d75c11ff2799eeb7f8fa39259c133 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 21 Mar 2016 14:25:11 +0000 Subject: [PATCH 2/2] provider/digitalocean: Check for nil response This applies the same fix to `digitalocean_ssh_key` as #5588 applies to droplets. Fixes #5402. The report there gives weight to my theory that this occurs when there are transport issues. --- builtin/providers/digitalocean/resource_digitalocean_ssh_key.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/digitalocean/resource_digitalocean_ssh_key.go b/builtin/providers/digitalocean/resource_digitalocean_ssh_key.go index 79614f599998..094df96dd56c 100644 --- a/builtin/providers/digitalocean/resource_digitalocean_ssh_key.go +++ b/builtin/providers/digitalocean/resource_digitalocean_ssh_key.go @@ -74,7 +74,7 @@ func resourceDigitalOceanSSHKeyRead(d *schema.ResourceData, meta interface{}) er if err != nil { // If the key is somehow already destroyed, mark as // successfully gone - if resp.StatusCode == 404 { + if resp != nil && resp.StatusCode == 404 { d.SetId("") return nil }