Rever archive_metadata refactoring (For simplifying)

8 files changed, 13 insertions, 13 deletions

diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index d0aba6f6652..c9ce042a1c5 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -28,7 +28,7 @@ module Ci
 
     enum file_type: {
       archive: 1,
-      archive_metadata: 2,
+      metadata: 2,
       trace: 3,
       junit: 4
     }
diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb
index 5ce7d693249..ff52ca64459 100644
--- a/app/models/concerns/artifact_migratable.rb
+++ b/app/models/concerns/artifact_migratable.rb
@@ -7,7 +7,7 @@ module ArtifactMigratable
   end
 
   def artifacts_metadata
-    job_artifacts_archive_metadata&.file || legacy_artifacts_metadata
+    job_artifacts_metadata&.file || legacy_artifacts_metadata
   end
 
   def artifacts?
@@ -31,8 +31,8 @@ module ArtifactMigratable
   end
 
   def remove_artifacts_metadata!
-    if job_artifacts_archive_metadata
-      job_artifacts_archive_metadata.destroy
+    if job_artifacts_metadata
+      job_artifacts_metadata.destroy
     else
       remove_legacy_artifacts_metadata!
     end
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index db280bded6c..8bd1f1ae4e0 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -182,7 +182,7 @@ FactoryBot.define do
     trait :artifacts do
       after(:create) do |build|
         create(:ci_job_artifact, :archive, job: build, expire_at: build.artifacts_expire_at)
-        create(:ci_job_artifact, :archive_metadata, job: build, expire_at: build.artifacts_expire_at)
+        create(:ci_job_artifact, :metadata, job: build, expire_at: build.artifacts_expire_at)
         build.reload
       end
     end
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 631e92f7338..a6a87782fe7 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -24,8 +24,8 @@ FactoryBot.define do
       end
     end
 
-    trait :archive_metadata do
-      file_type :archive_metadata
+    trait :metadata do
+      file_type :metadata
       file_format :gzip
 
       after(:build) do |artifact, _|
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 3c722148f66..7c3ddab1751 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -861,7 +861,7 @@ describe Ci::Build do
           let!(:build) { create(:ci_build, :success, :artifacts) }
 
           before do
-            build.job_artifacts_archive_metadata.destroy
+            build.job_artifacts_metadata.destroy
           end
 
           describe '#erase' do
@@ -2700,7 +2700,7 @@ describe Ci::Build do
     subject { build.artifacts_metadata_entry(path) }
 
     context 'when using local storage' do
-      let!(:metadata) { create(:ci_job_artifact, :archive_metadata, job: build) }
+      let!(:metadata) { create(:ci_job_artifact, :metadata, job: build) }
 
       context 'for existing file' do
         it 'does exist' do
@@ -2720,7 +2720,7 @@ describe Ci::Build do
     context 'when using remote storage' do
       include HttpIOHelpers
 
-      let!(:metadata) { create(:ci_job_artifact, :remote_store, :archive_metadata, job: build) }
+      let!(:metadata) { create(:ci_job_artifact, :remote_store, :metadata, job: build) }
       let(:file_path) { expand_fixture_path('ci_build_artifacts_metadata.gz') }
 
       before do
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 1c8b09529b0..77efb877662 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -1382,7 +1382,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
             let(:stored_metadata_file) { job.reload.artifacts_metadata.file }
             let(:stored_artifacts_size) { job.reload.artifacts_size }
             let(:stored_artifacts_sha256) { job.reload.job_artifacts_archive.file_sha256 }
-            let(:stored_metadata_sha256) { job.reload.job_artifacts_archive_metadata.file_sha256 }
+            let(:stored_metadata_sha256) { job.reload.job_artifacts_metadata.file_sha256 }
 
             before do
               post(api("/jobs/#{job.id}/artifacts"), post_data, headers_with_token)
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index fc66288e3cf..18d52082399 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -24,7 +24,7 @@ describe Ci::RetryBuildService do
        artifacts_file artifacts_metadata artifacts_size created_at
        updated_at started_at finished_at queued_at erased_by
        erased_at auto_canceled_by job_artifacts job_artifacts_archive
-       job_artifacts_archive_metadata job_artifacts_trace job_artifacts_junit].freeze
+       job_artifacts_metadata job_artifacts_trace job_artifacts_junit].freeze
 
   IGNORE_ACCESSORS =
     %i[type lock_version target_url base_tags trace_sections
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index d9174e6846c..a4c103e6f30 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -79,7 +79,7 @@ describe Projects::UpdatePagesService do
     context "for a valid job" do
       before do
         create(:ci_job_artifact, file: file, job: build)
-        create(:ci_job_artifact, file_type: :archive_metadata, file: metadata, job: build)
+        create(:ci_job_artifact, file_type: :metadata, file: metadata, job: build)
 
         build.reload
       end