From 77946af4720caeea85397fc787ecc17e6b77b683 Mon Sep 17 00:00:00 2001 From: uturunku1 Date: Wed, 15 Dec 2021 14:53:31 -0800 Subject: [PATCH] pull latest changes from go-tfe branch and use use new field name that previously was incorrectly named TaskStage --- go.sum | 2 ++ internal/cloud/backend_plan.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index e8ef3c7f2..88a064562 100644 --- a/go.sum +++ b/go.sum @@ -409,6 +409,8 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-tfe v0.20.1-0.20211210153426-243d1b1eb033 h1:SoQhT2l6xHh7LOprw1F6MPzxSk65kSXdyfubOs8D+Ho= github.com/hashicorp/go-tfe v0.20.1-0.20211210153426-243d1b1eb033/go.mod h1:gyXLXbpBVxA2F/6opah8XBsOkZJxHYQmghl0OWi8keI= +github.com/hashicorp/go-tfe v0.20.1-0.20211215223223-3057a43c4f5c h1:S35GDGdpbcmTFDZj+JQDO84CANiYdUMs++JxBXwJyvU= +github.com/hashicorp/go-tfe v0.20.1-0.20211215223223-3057a43c4f5c/go.mod h1:gyXLXbpBVxA2F/6opah8XBsOkZJxHYQmghl0OWi8keI= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= diff --git a/internal/cloud/backend_plan.go b/internal/cloud/backend_plan.go index 5f70934bf..a0ae59d2c 100644 --- a/internal/cloud/backend_plan.go +++ b/internal/cloud/backend_plan.go @@ -354,7 +354,7 @@ in order to capture the filesystem context the remote workspace expects: } // Await pre-apply run tasks - if len(r.TaskStage) > 0 { + if len(r.TaskStages) > 0 { context := &IntegrationContext{ B: b, StopContext: stopCtx, @@ -363,7 +363,7 @@ in order to capture the filesystem context the remote workspace expects: Run: r, } - if stageID := getTaskStageIDByName(r.TaskStage, "pre_apply"); stageID != nil { + if stageID := getTaskStageIDByName(r.TaskStages, "pre_apply"); stageID != nil { err = b.runTasks(context, context.BeginOutput("Run Tasks (pre-apply)"), *stageID) if err != nil { return r, err