diff --git a/pkg/engine/runtime/terraform/terraform_runtime.go b/pkg/engine/runtime/terraform/terraform_runtime.go index df0a2abf..133930e7 100644 --- a/pkg/engine/runtime/terraform/terraform_runtime.go +++ b/pkg/engine/runtime/terraform/terraform_runtime.go @@ -6,7 +6,6 @@ import ( "os" "path/filepath" "strings" - "sync" "time" "github.com/spf13/afero" @@ -29,7 +28,6 @@ var tfEvents = cache.New(cache.NoExpiration, cache.NoExpiration) type TerraformRuntime struct { tfops.WorkSpace - mu *sync.Mutex } func NewTerraformRuntime(_ *apiv1.Resource) (runtime.Runtime, error) { @@ -37,16 +35,12 @@ func NewTerraformRuntime(_ *apiv1.Resource) (runtime.Runtime, error) { ws := tfops.NewWorkSpace(fs) TFRuntime := &TerraformRuntime{ WorkSpace: *ws, - mu: &sync.Mutex{}, } return TFRuntime, nil } // Apply Terraform resource func (t *TerraformRuntime) Apply(ctx context.Context, request *runtime.ApplyRequest) *runtime.ApplyResponse { - t.mu.Lock() - defer t.mu.Unlock() - plan := request.PlanResource stackPath := request.Stack.Path key := plan.ResourceKey() @@ -199,10 +193,8 @@ func (t *TerraformRuntime) Read(ctx context.Context, request *runtime.ReadReques if priorResource == nil { return &runtime.ReadResponse{Resource: nil, Status: nil} } - var tfstate *tfops.StateRepresentation - t.mu.Lock() - defer t.mu.Unlock() + var tfstate *tfops.StateRepresentation stackPath := request.Stack.Path tfCacheDir := buildTFCacheDir(stackPath, planResource.ResourceKey()) t.WorkSpace.SetStackDir(stackPath) @@ -266,8 +258,6 @@ func (t *TerraformRuntime) Import(ctx context.Context, request *runtime.ImportRe func (t *TerraformRuntime) Delete(ctx context.Context, request *runtime.DeleteRequest) (res *runtime.DeleteResponse) { stackPath := request.Stack.Path tfCacheDir := buildTFCacheDir(stackPath, request.Resource.ResourceKey()) - t.mu.Lock() - defer t.mu.Unlock() t.WorkSpace.SetStackDir(stackPath) t.WorkSpace.SetCacheDir(tfCacheDir) diff --git a/pkg/engine/runtime/terraform/tfops/workspace.go b/pkg/engine/runtime/terraform/tfops/workspace.go index 8718115b..79f0460a 100644 --- a/pkg/engine/runtime/terraform/tfops/workspace.go +++ b/pkg/engine/runtime/terraform/tfops/workspace.go @@ -192,7 +192,7 @@ func (w *WorkSpace) Apply(ctx context.Context) (*StateRepresentation, error) { return nil, err } - cmd := exec.CommandContext(ctx, "terraform", chdir, "apply", "-auto-approve", "-json", "-lock=false") + cmd := exec.CommandContext(ctx, "terraform", chdir, "apply", "-auto-approve", "-json") cmd.Dir = w.stackDir envs, err := w.initEnvs() if err != nil { @@ -301,7 +301,7 @@ func (w *WorkSpace) RefreshOnly(ctx context.Context) (*StateRepresentation, erro if err != nil { return nil, err } - cmd := exec.CommandContext(ctx, "terraform", chdir, "apply", "-auto-approve", "-json", "--refresh-only", "-lock=false") + cmd := exec.CommandContext(ctx, "terraform", chdir, "apply", "-auto-approve", "-json", "--refresh-only") cmd.Dir = w.stackDir envs, err := w.initEnvs()