Skip to content

Commit

Permalink
Merge pull request #5748 from hashicorp/b-5402
Browse files Browse the repository at this point in the history
provider/digitalocean: Check for nil response
  • Loading branch information
jen20 committed Mar 21, 2016
2 parents 4003905 + fed666a commit 07297f1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
* provider/vsphere: provide `host` to provisioner connections [GH-5558]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 07297f1

Please sign in to comment.