Datasource: Panic proof (#1723)

julienduchesne · web-flow · commit edd6cc8c6bfe · 2024-07-26T16:38:36.000-04:00
Closes #1722 There shouldn't be any cases where it panics now
diff --git a/internal/resources/grafana/data_source_data_source.go b/internal/resources/grafana/data_source_data_source.go
@@ -44,11 +44,17 @@ func datasourceDatasourceRead(ctx context.Context, d *schema.ResourceData, meta
 		resp, err = client.Datasources.GetDataSourceByName(name.(string))
 	} else if uid, ok := d.GetOk("uid"); ok {
 		resp, err = client.Datasources.GetDataSourceByUID(uid.(string))
+	} else {
+		return diag.Errorf("name or uid must be set")
 	}
 
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
+	if resp == nil {
+		return diag.Errorf("unexpected state, API response is nil")
+	}
+
 	return datasourceToState(d, resp.GetPayload())
 }

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,17 @@ func datasourceDatasourceRead(ctx context.Context, d *schema.ResourceData, meta`
`44`	`44`	`resp, err = client.Datasources.GetDataSourceByName(name.(string))`
`45`	`45`	`} else if uid, ok := d.GetOk("uid"); ok {`
`46`	`46`	`resp, err = client.Datasources.GetDataSourceByUID(uid.(string))`
	`47`	`+ } else {`
	`48`	`+ return diag.Errorf("name or uid must be set")`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`if err != nil {`
`50`	`52`	`return diag.FromErr(err)`
`51`	`53`	`}`
`52`	`54`
	`55`	`+ if resp == nil {`
	`56`	`+ return diag.Errorf("unexpected state, API response is nil")`
	`57`	`+ }`
	`58`	`+`
`53`	`59`	`return datasourceToState(d, resp.GetPayload())`
`54`	`60`	`}`