ensure warnings are not lost

hashicorp · Apr 8, 2020 · 289255d · 289255d
1 parent 13b40e5
commit 289255d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/internal/helper/plugin/grpc_provider.go b/internal/helper/plugin/grpc_provider.go
@@ -541,8 +541,8 @@ func (s *GRPCProviderServer) ReadResource(ctx context.Context, req *proto.ReadRe
 	instanceState.Meta = private
 
 	newInstanceState, diags := res.RefreshWithoutUpgrade(ctx, instanceState, s.provider.Meta())
+	resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, diags)
 	if diags.HasError() {
-		resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, diags)
 		return resp, nil
 	}
 
@@ -1051,8 +1051,8 @@ func (s *GRPCProviderServer) ReadDataSource(ctx context.Context, req *proto.Read
 
 	// now we can get the new complete data source
 	newInstanceState, diags := res.ReadDataApply(ctx, diff, s.provider.Meta())
+	resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, diags)
 	if diags.HasError() {
-		resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, diags)
 		return resp, nil
 	}