diff options
Diffstat (limited to 'app/models/terraform/state.rb')
| -rw-r--r-- | app/models/terraform/state.rb | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/app/models/terraform/state.rb b/app/models/terraform/state.rb index d329b429c9d..1b99f310e1a 100644 --- a/app/models/terraform/state.rb +++ b/app/models/terraform/state.rb @@ -3,13 +3,6 @@ module Terraform class State < ApplicationRecord include UsageStatistics - include FileStoreMounter - include IgnorableColumns - # These columns are being removed since geo replication falls to the versioned state - # Tracking in https://gitlab.com/gitlab-org/gitlab/-/issues/258262 - ignore_columns %i[verification_failure verification_retry_at verified_at verification_retry_count verification_checksum], - remove_with: '13.7', - remove_after: '2020-12-22' HEX_REGEXP = %r{\A\h+\z}.freeze UUID_LENGTH = 32 @@ -35,20 +28,9 @@ module Terraform format: { with: HEX_REGEXP, message: 'only allows hex characters' } default_value_for(:uuid, allows_nil: false) { SecureRandom.hex(UUID_LENGTH / 2) } - default_value_for(:versioning_enabled, true) - - mount_file_store_uploader StateUploader - - def file_store - super || StateUploader.default_store - end def latest_file - if versioning_enabled? - latest_version&.file - else - latest_version&.file || file - end + latest_version&.file end def locked? @@ -56,13 +38,14 @@ module Terraform end def update_file!(data, version:, build:) + # This check is required to maintain backwards compatibility with + # states that were created prior to versioning being supported. + # This can be removed in 14.0 when support for these states is dropped. + # See https://gitlab.com/gitlab-org/gitlab/-/issues/258960 if versioning_enabled? create_new_version!(data: data, version: version, build: build) - elsif latest_version.present? - migrate_legacy_version!(data: data, version: version, build: build) else - self.file = data - save! + migrate_legacy_version!(data: data, version: version, build: build) end end |