From 139cbd60fdff554e4aab862291615a31c0166ef0 Mon Sep 17 00:00:00 2001
From: Justin Van Patten <jvp@justinvp.com>
Date: Fri, 12 Feb 2021 10:36:38 -0800
Subject: [PATCH] wip

---
 sdk/go/pulumi/provider.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sdk/go/pulumi/provider.go b/sdk/go/pulumi/provider.go
index 3fac02a91..95f25d370 100644
--- a/sdk/go/pulumi/provider.go
+++ b/sdk/go/pulumi/provider.go
@@ -264,6 +264,12 @@ func (p *providerServer) Construct(ctx context.Context,
 		return nil, err
 	}
 
+	// Ensure all outstanding RPCs have completed before proceeding. Also, prevent any new RPCs from happening.
+	pulumiCtx.waitForRPCs()
+	if pulumiCtx.rpcError != nil {
+		return nil, errors.Wrap(pulumiCtx.rpcError, "waiting for RPCs")
+	}
+
 	rpcURN, _, _, err := result.URN.ToURNOutput().awaitURN(ctx)
 	if err != nil {
 		return nil, err