From 1475bb85450b5f3d4e5fd691683d8807004b24a3 Mon Sep 17 00:00:00 2001 From: Shawna Monero Date: Mon, 18 Mar 2024 20:04:03 -0700 Subject: [PATCH] first draft --- server/neptune/adhoc/server.go | 1 - server/neptune/workflows/internal/terraform/workflow.go | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/neptune/adhoc/server.go b/server/neptune/adhoc/server.go index f89574949..578b374e6 100644 --- a/server/neptune/adhoc/server.go +++ b/server/neptune/adhoc/server.go @@ -196,7 +196,6 @@ type AdhocTerraformWorkflowExecutionParams struct { DeploymentID string Root terraform.Root Repo ghClient.Repo - // TODO: in separate PR, fill in github.Repo and terraform.Root (need helper funcs to get those) } // This function constructs the request we want to send to the temporal client, diff --git a/server/neptune/workflows/internal/terraform/workflow.go b/server/neptune/workflows/internal/terraform/workflow.go index 469b812cb..97e632a9d 100644 --- a/server/neptune/workflows/internal/terraform/workflow.go +++ b/server/neptune/workflows/internal/terraform/workflow.go @@ -343,11 +343,6 @@ func (r *Runner) run(ctx workflow.Context) (Response, error) { return Response{}, r.toExternalError(err, "fetching root") } - // if we are in adhoc / terraform admin mode, we don't need to cleanup, plan, validate, or apply - if r.Request.WorkflowMode == terraform.Adhoc { - return Response{}, nil - } - defer func() { r.executeCleanup(ctx, cleanup) }() @@ -357,6 +352,10 @@ func (r *Runner) run(ctx workflow.Context) (Response, error) { return Response{}, r.toExternalError(err, "running plan job") } + if r.Request.WorkflowMode == terraform.Adhoc { + return Response{}, nil + } + if r.Request.WorkflowMode == terraform.PR { validationResults, err := r.Validate(ctx, root, response.ServerURL, planResponse.PlanJSONFile) if err != nil {