Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix panics introduced in move from ReadFunc to ReadContextFunc #506

Merged
merged 2 commits into from
Oct 22, 2020
Merged

Fix panics introduced in move from ReadFunc to ReadContextFunc #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
950a0d4
resourceDigitalOceanCDNRead: return nil on success (Closes: #505).
andrewsomething Oct 22, 2020
af32504
resourceDigitalOceanAppRead: return nil on success.
andrewsomething Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions digitalocean/resource_digitalocean_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion digitalocean/resource_digitalocean_cdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down