diff --git a/server/neptune/workflows/activities/terraform/job.go b/server/neptune/workflows/activities/terraform/job.go index 64f6cf51f..2937dcae6 100644 --- a/server/neptune/workflows/activities/terraform/job.go +++ b/server/neptune/workflows/activities/terraform/job.go @@ -53,5 +53,5 @@ type WorkflowMode int const ( Deploy WorkflowMode = iota PR - Admin + Adhoc ) diff --git a/server/neptune/workflows/internal/terraform/job/runner.go b/server/neptune/workflows/internal/terraform/job/runner.go index a38d8237f..db396bb2e 100644 --- a/server/neptune/workflows/internal/terraform/job/runner.go +++ b/server/neptune/workflows/internal/terraform/job/runner.go @@ -2,6 +2,7 @@ package job import ( "context" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/command" key "github.com/runatlantis/atlantis/server/neptune/context" @@ -215,7 +216,7 @@ func (r *JobRunner) apply(executionCtx *ExecutionContext, planFile string, step } func (r *JobRunner) plan(ctx *ExecutionContext, mode *terraform.PlanMode, workflowMode terraform.WorkflowMode, extraArgs []string) (activities.TerraformPlanResponse, error) { - if workflowMode == terraform.Admin { + if workflowMode == terraform.Adhoc { // Admin mode doesn't need to run a plan. return activities.TerraformPlanResponse{}, nil } diff --git a/server/neptune/workflows/internal/terraform/root_fetcher.go b/server/neptune/workflows/internal/terraform/root_fetcher.go index 66d6856bc..d714ab889 100644 --- a/server/neptune/workflows/internal/terraform/root_fetcher.go +++ b/server/neptune/workflows/internal/terraform/root_fetcher.go @@ -27,7 +27,7 @@ func (r *RootFetcher) Fetch(ctx workflow.Context) (*terraform.LocalRoot, func(wo return nil, func(_ workflow.Context) error { return nil }, err } - if r.Request.WorkflowMode == terraform.Admin { + if r.Request.WorkflowMode == terraform.Adhoc { return fetchRootResponse.LocalRoot, func(c workflow.Context) error { return nil }, nil } diff --git a/server/neptune/workflows/internal/terraform/workflow.go b/server/neptune/workflows/internal/terraform/workflow.go index 98e08aa4c..0b674dfa7 100644 --- a/server/neptune/workflows/internal/terraform/workflow.go +++ b/server/neptune/workflows/internal/terraform/workflow.go @@ -3,10 +3,11 @@ package terraform import ( "context" "fmt" - "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" "net/url" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" + key "github.com/runatlantis/atlantis/server/neptune/context" "go.temporal.io/api/enums/v1" "go.temporal.io/sdk/client" @@ -350,7 +351,7 @@ func (r *Runner) run(ctx workflow.Context) (Response, error) { return Response{}, r.toExternalError(err, "running plan job") } - if r.Request.WorkflowMode == terraform.Admin { + if r.Request.WorkflowMode == terraform.Adhoc { return Response{}, nil } diff --git a/server/neptune/workflows/internal/terraform/workflow_test.go b/server/neptune/workflows/internal/terraform/workflow_test.go index bb17b6dc0..e1af5d7d5 100644 --- a/server/neptune/workflows/internal/terraform/workflow_test.go +++ b/server/neptune/workflows/internal/terraform/workflow_test.go @@ -4,11 +4,12 @@ import ( "context" "errors" "fmt" - "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" "net/url" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" + "go.temporal.io/sdk/activity" "go.temporal.io/sdk/client" @@ -176,7 +177,7 @@ func testTerraformWorkflow(ctx workflow.Context, req request) (*response, error) WorkflowMode: req.WorkflowMode, } - if req.WorkflowMode == terraformModel.Admin { + if req.WorkflowMode == terraformModel.Adhoc { tAct = nil } @@ -649,7 +650,7 @@ func TestSuccess_AdminMode(t *testing.T) { // execute workflow env.ExecuteWorkflow(testTerraformWorkflow, request{ - WorkflowMode: terraformModel.Admin, + WorkflowMode: terraformModel.Adhoc, }) assert.True(t, env.IsWorkflowCompleted())