Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 9 insertions, 0 deletions

diff --git a/app/models/terraform/state.rb b/app/models/terraform/state.rb
index 1b99f310e1a..efbbd86ae4a 100644
--- a/app/models/terraform/state.rb
+++ b/app/models/terraform/state.rb
@@ -27,6 +27,8 @@ module Terraform
     validates :uuid, presence: true, uniqueness: true, length: { is: UUID_LENGTH },
               format: { with: HEX_REGEXP, message: 'only allows hex characters' }
 
+    before_destroy :ensure_state_is_unlocked
+
     default_value_for(:uuid, allows_nil: false) { SecureRandom.hex(UUID_LENGTH / 2) }
 
     def latest_file
@@ -87,6 +89,13 @@ module Terraform
       new_version.save!
     end
 
+    def ensure_state_is_unlocked
+      return unless locked?
+
+      errors.add(:base, s_("Terraform|You cannot remove the State file because it's locked. Unlock the State file first before removing it."))
+      throw :abort # rubocop:disable Cop/BanCatchThrow
+    end
+
     def parse_serial(file)
       Gitlab::Json.parse(file)["serial"]
     rescue JSON::ParserError