1 files changed, 8 insertions, 4 deletions
diff --git a/app/models/backends/terraform_aws/mini_environment_methods.rb b/app/models/backends/terraform_aws/mini_environment_methods.rb
index 6049829..1885af7 100644
--- a/app/models/backends/terraform_aws/mini_environment_methods.rb
+++ b/app/models/backends/terraform_aws/mini_environment_methods.rb
@@ -89,10 +89,14 @@ module Backends::TerraformAws::MiniEnvironmentMethods
   end
 
   def within_terraform_working_directory(mini_environment, &block)
-    TerraformWorkingDirectory.new(
-      mini_environment_state_id(mini_environment),
-      'terraform/aws/mini_environment'
-    ).within_working_directory(&block)
+    with_advisory_lock(
+      "aws_mini_environment_terraform_working_directory/#{mini_environment.id}"
+    ) do
+      TerraformWorkingDirectory.new(
+        mini_environment_state_id(mini_environment),
+        'terraform/aws/mini_environment'
+      ).within_working_directory(&block)
+    end
   end
 
   def mini_environment_state_id(mini_environment)