From 295deb7061e8637e7750ba042cfaadb3176ceb7e Mon Sep 17 00:00:00 2001
From: Andrew Starr-Bochicchio <andrewsomething@users.noreply.github.com>
Date: Thu, 22 Oct 2020 13:32:49 -0400
Subject: [PATCH] Fix panics introduced in move from ReadFunc to
 ReadContextFunc (#506)

* resourceDigitalOceanCDNRead: return nil on success (Closes: #505).

* resourceDigitalOceanAppRead: return nil on success.
---
 digitalocean/resource_digitalocean_app.go | 5 +++--
 digitalocean/resource_digitalocean_cdn.go | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/digitalocean/resource_digitalocean_app.go b/digitalocean/resource_digitalocean_app.go
index 118e93f0c..f7b512a55 100644
--- a/digitalocean/resource_digitalocean_app.go
+++ b/digitalocean/resource_digitalocean_app.go
@@ -3,10 +3,11 @@ package digitalocean
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"log"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+
 	"github.com/digitalocean/godo"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -115,7 +116,7 @@ func resourceDigitalOceanAppRead(ctx context.Context, d *schema.ResourceData, me
 		return diag.Errorf("[DEBUG] Error setting app spec: %#v", err)
 	}
 
-	return diag.FromErr(err)
+	return nil
 }
 
 func resourceDigitalOceanAppUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
diff --git a/digitalocean/resource_digitalocean_cdn.go b/digitalocean/resource_digitalocean_cdn.go
index 7a1c02fcd..d3728fb95 100644
--- a/digitalocean/resource_digitalocean_cdn.go
+++ b/digitalocean/resource_digitalocean_cdn.go
@@ -212,7 +212,7 @@ func resourceDigitalOceanCDNRead(ctx context.Context, d *schema.ResourceData, me
 		d.Set("certificate_name", cert.Name)
 	}
 
-	return diag.FromErr(err)
+	return nil
 }
 
 func resourceDigitalOceanCDNUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {