From 15288caf644d2c95a401cb5008edc583ffaca98b Mon Sep 17 00:00:00 2001 From: mrinalirao Date: Fri, 2 Dec 2022 10:15:51 +1100 Subject: [PATCH] Code Improvements: - Use tfe consts instead of hardcoded values - fix logic when polling taskStage - remove inaccurate comment --- internal/cloud/backend_taskStage_taskResults.go | 8 ++++---- internal/cloud/backend_taskStages.go | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/cloud/backend_taskStage_taskResults.go b/internal/cloud/backend_taskStage_taskResults.go index 96d085df5a..0f96889b69 100644 --- a/internal/cloud/backend_taskStage_taskResults.go +++ b/internal/cloud/backend_taskStage_taskResults.go @@ -62,18 +62,18 @@ func (trs *taskResultSummarizer) Summarize(context *IntegrationContext, output I func summarizeTaskResults(taskResults []*tfe.TaskResult) *taskResultSummary { var pendingCount, errCount, errMandatoryCount, passedCount int for _, task := range taskResults { - if task.Status == "unreachable" { + if task.Status == tfe.TaskUnreachable { return &taskResultSummary{ unreachable: true, } - } else if task.Status == "running" || task.Status == "pending" { + } else if task.Status == tfe.TaskRunning || task.Status == tfe.TaskPending { pendingCount++ - } else if task.Status == "passed" { + } else if task.Status == tfe.TaskPassed { passedCount++ } else { // Everything else is a failure errCount++ - if task.WorkspaceTaskEnforcementLevel == "mandatory" { + if task.WorkspaceTaskEnforcementLevel == tfe.Mandatory { errMandatoryCount++ } } diff --git a/internal/cloud/backend_taskStages.go b/internal/cloud/backend_taskStages.go index eba4f15de3..c623d72bb5 100644 --- a/internal/cloud/backend_taskStages.go +++ b/internal/cloud/backend_taskStages.go @@ -89,11 +89,10 @@ func (b *Cloud) runTaskStage(ctx *IntegrationContext, output IntegrationOutputWr break } if !cont { - continue + return false, nil } // cont is true and we must continue to poll if msg != nil { - // print msg every 4 seconds if i%4 == 0 && i > 0 { output.OutputElapsed(*msg, len(*msg)) // Up to 2 digits are allowed by the max message allocation }