From 105fcb3cac9e61d8aa0fbadada424c1108234271 Mon Sep 17 00:00:00 2001
From: Ryan Uber <ru@ryanuber.com>
Date: Wed, 15 Apr 2020 12:31:44 -0700
Subject: [PATCH] backend/remote: move reading policy check logs earlier

---
 backend/remote/backend_common.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/remote/backend_common.go b/backend/remote/backend_common.go
index a2d5e07d87..c92b80e92e 100644
--- a/backend/remote/backend_common.go
+++ b/backend/remote/backend_common.go
@@ -332,6 +332,14 @@ func (b *Remote) checkPolicy(stopCtx, cancelCtx context.Context, op *backend.Ope
 		b.CLI.Output("\n------------------------------------------------------------------------\n")
 	}
 	for i, pc := range r.PolicyChecks {
+		// Read the policy check logs. This is a blocking call that will only
+		// return once the policy check is complete.
+		logs, err := b.client.PolicyChecks.Logs(stopCtx, pc.ID)
+		if err != nil {
+			return generalError("Failed to retrieve policy check logs", err)
+		}
+		reader := bufio.NewReaderSize(logs, 64*1024)
+
 		// Retrieve the policy check to get its current status.
 		pc, err := b.client.PolicyChecks.Read(stopCtx, pc.ID)
 		if err != nil {
@@ -347,12 +355,6 @@ func (b *Remote) checkPolicy(stopCtx, cancelCtx context.Context, op *backend.Ope
 			}
 		}
 
-		logs, err := b.client.PolicyChecks.Logs(stopCtx, pc.ID)
-		if err != nil {
-			return generalError("Failed to retrieve policy check logs", err)
-		}
-		reader := bufio.NewReaderSize(logs, 64*1024)
-
 		var msgPrefix string
 		switch pc.Scope {
 		case tfe.PolicyScopeOrganization: