Merge branch 'debian_source_s' into 'master'

Fix Debian Sources file name

See merge request gitlab-org/gitlab!74445

app/models/concerns/packages/debian/component_file.rb

@@ -20,13 +20,13 @@ module Packages
         belongs_to :component, class_name: "Packages::Debian::#{container_type.capitalize}Component", inverse_of: :files
         belongs_to :architecture, class_name: "Packages::Debian::#{container_type.capitalize}Architecture", inverse_of: :files, optional: true
 
-        enum file_type: { packages: 1, source: 2, di_packages: 3 }
+        enum file_type: { packages: 1, sources: 2, di_packages: 3 }
         enum compression_type: { gz: 1, bz2: 2, xz: 3 }
 
         validates :component, presence: true
         validates :file_type, presence: true
-        validates :architecture, presence: true, unless: :source?
-        validates :architecture, absence: true, if: :source?
+        validates :architecture, presence: true, unless: :sources?
+        validates :architecture, absence: true, if: :sources?
         validates :file, length: { minimum: 0, allow_nil: false }
         validates :size, presence: true
         validates :file_store, presence: true
@@ -81,7 +81,7 @@ module Packages
           case file_type
           when 'packages'
             "#{component.name}/binary-#{architecture.name}/#{file_name}#{extension}"
-          when 'source'
+          when 'sources'
             "#{component.name}/source/#{file_name}#{extension}"
           when 'di_packages'
             "#{component.name}/debian-installer/binary-#{architecture.name}/#{file_name}#{extension}"

app/services/packages/debian/generate_distribution_service.rb

@@ -91,7 +91,7 @@ module Packages
             generate_component_file(component, :packages, architecture, :deb)
             generate_component_file(component, :di_packages, architecture, :udeb)
           end
-          generate_component_file(component, :source, nil, :dsc)
+          generate_component_file(component, :sources, nil, :dsc)
         end
       end
 

spec/factories/packages/debian/component_file.rb

@@ -27,8 +27,8 @@ FactoryBot.define do
       file_type { :packages }
     end
 
-    trait(:source) do
-      file_type { :source }
+    trait(:sources) do
+      file_type { :sources }
       architecture { nil }
     end
 

spec/services/packages/debian/update_distribution_service_spec.rb

@@ -61,9 +61,9 @@ RSpec.describe Packages::Debian::UpdateDistributionService do
       let_it_be(:architecture0) { create("debian_#{container_type}_architecture", distribution: distribution, name: 'all') }
       let_it_be(:architecture1) { create("debian_#{container_type}_architecture", distribution: distribution, name: 'architecture1') }
       let_it_be(:architecture2) { create("debian_#{container_type}_architecture", distribution: distribution, name: 'architecture2') }
-      let_it_be(:component_file1) { create("debian_#{container_type}_component_file", :source, component: component1) }
+      let_it_be(:component_file1) { create("debian_#{container_type}_component_file", :sources, component: component1) }
       let_it_be(:component_file2) { create("debian_#{container_type}_component_file", component: component1, architecture: architecture1) }
-      let_it_be(:component_file3) { create("debian_#{container_type}_component_file", :source, component: component2) }
+      let_it_be(:component_file3) { create("debian_#{container_type}_component_file", :sources, component: component2) }
       let_it_be(:component_file4) { create("debian_#{container_type}_component_file", component: component2, architecture: architecture2) }
 
       let(:original_params) do

spec/support/shared_examples/models/packages/debian/component_file_shared_example.rb

@@ -23,7 +23,7 @@ RSpec.shared_examples 'Debian Component File' do |container_type, can_freeze|
   let_it_be(:component_file_other_file_md5, freeze: can_freeze) { create("debian_#{container_type}_component_file", component: component1_1, architecture: architecture1_1, file_md5: 'other_md5') }
   let_it_be(:component_file_other_file_sha256, freeze: can_freeze) { create("debian_#{container_type}_component_file", component: component1_1, architecture: architecture1_1, file_sha256: 'other_sha256') }
   let_it_be(:component_file_other_container, freeze: can_freeze) { create("debian_#{container_type}_component_file", component: component2_1, architecture: architecture2_1) }
-  let_it_be_with_refind(:component_file_with_file_type_source) { create("debian_#{container_type}_component_file", :source, component: component1_1) }
+  let_it_be_with_refind(:component_file_with_file_type_sources) { create("debian_#{container_type}_component_file", :sources, component: component1_1) }
   let_it_be(:component_file_with_file_type_di_packages, freeze: can_freeze) { create("debian_#{container_type}_component_file", :di_packages, component: component1_1, architecture: architecture1_1) }
 
   subject { component_file_with_architecture }
@@ -43,8 +43,8 @@ RSpec.shared_examples 'Debian Component File' do |container_type, can_freeze|
       it { is_expected.to belong_to(:architecture).class_name("Packages::Debian::#{container_type.capitalize}Architecture").inverse_of(:files) }
     end
 
-    context 'with :source file_type' do
-      subject { component_file_with_file_type_source }
+    context 'with :sources file_type' do
+      subject { component_file_with_file_type_sources }
 
       it { is_expected.to belong_to(:architecture).class_name("Packages::Debian::#{container_type.capitalize}Architecture").inverse_of(:files).optional }
     end
@@ -66,8 +66,8 @@ RSpec.shared_examples 'Debian Component File' do |container_type, can_freeze|
         it { is_expected.to validate_presence_of(:architecture) }
       end
 
-      context 'with :source file_type' do
-        subject { component_file_with_file_type_source }
+      context 'with :sources file_type' do
+        subject { component_file_with_file_type_sources }
 
         it { is_expected.to validate_absence_of(:architecture) }
       end
@@ -135,10 +135,10 @@ RSpec.shared_examples 'Debian Component File' do |container_type, can_freeze|
     end
 
     describe '.with_file_type' do
-      subject { described_class.with_file_type(:source) }
+      subject { described_class.with_file_type(:sources) }
 
       it do
-        expect(subject.to_a).to contain_exactly(component_file_with_file_type_source)
+        expect(subject.to_a).to contain_exactly(component_file_with_file_type_sources)
       end
     end
 
@@ -214,9 +214,9 @@ RSpec.shared_examples 'Debian Component File' do |container_type, can_freeze|
     end
 
     context 'with a Source file_type' do
-      subject { component_file_with_file_type_source.relative_path }
+      subject { component_file_with_file_type_sources.relative_path }
 
-      it { is_expected.to eq("#{component1_1.name}/source/Source") }
+      it { is_expected.to eq("#{component1_1.name}/source/Sources") }
     end
 
     context 'with a DI Packages file_type' do

spec/support/shared_examples/services/packages/debian/generate_distribution_shared_examples.rb

@@ -126,7 +126,7 @@ RSpec.shared_examples 'Generate Debian Distribution and component files' do
         SHA256: #{package_files[4].file_sha256}
         EOF
 
-        expected_main_source_content = <<~EOF
+        expected_main_sources_content = <<~EOF
         Package: #{package.name}
         Binary: sample-dev, libsample0, sample-udeb
         Version: #{package.version}
@@ -158,7 +158,7 @@ RSpec.shared_examples 'Generate Debian Distribution and component files' do
         check_component_file(current_time.round, 'main', :di_packages, 'amd64', expected_main_amd64_di_content)
         check_component_file(current_time.round, 'main', :di_packages, 'arm64', nil)
 
-        check_component_file(current_time.round, 'main', :source, nil, expected_main_source_content)
+        check_component_file(current_time.round, 'main', :sources, nil, expected_main_sources_content)
 
         check_component_file(current_time.round, 'contrib', :packages, 'all', nil)
         check_component_file(current_time.round, 'contrib', :packages, 'amd64', nil)
@@ -168,7 +168,7 @@ RSpec.shared_examples 'Generate Debian Distribution and component files' do
         check_component_file(current_time.round, 'contrib', :di_packages, 'amd64', nil)
         check_component_file(current_time.round, 'contrib', :di_packages, 'arm64', nil)
 
-        check_component_file(current_time.round, 'contrib', :source, nil, nil)
+        check_component_file(current_time.round, 'contrib', :sources, nil, nil)
 
         main_amd64_size = expected_main_amd64_content.length
         main_amd64_md5sum = Digest::MD5.hexdigest(expected_main_amd64_content)
@@ -182,9 +182,9 @@ RSpec.shared_examples 'Generate Debian Distribution and component files' do
         main_amd64_di_md5sum = Digest::MD5.hexdigest(expected_main_amd64_di_content)
         main_amd64_di_sha256 = Digest::SHA256.hexdigest(expected_main_amd64_di_content)
 
-        main_source_size = expected_main_source_content.length
-        main_source_md5sum = Digest::MD5.hexdigest(expected_main_source_content)
-        main_source_sha256 = Digest::SHA256.hexdigest(expected_main_source_content)
+        main_sources_size = expected_main_sources_content.length
+        main_sources_md5sum = Digest::MD5.hexdigest(expected_main_sources_content)
+        main_sources_sha256 = Digest::SHA256.hexdigest(expected_main_sources_content)
 
         expected_release_content = <<~EOF
         Codename: unstable
@@ -199,14 +199,14 @@ RSpec.shared_examples 'Generate Debian Distribution and component files' do
          d41d8cd98f00b204e9800998ecf8427e        0 contrib/debian-installer/binary-amd64/Packages
          d41d8cd98f00b204e9800998ecf8427e        0 contrib/binary-arm64/Packages
          d41d8cd98f00b204e9800998ecf8427e        0 contrib/debian-installer/binary-arm64/Packages
-         d41d8cd98f00b204e9800998ecf8427e        0 contrib/source/Source
+         d41d8cd98f00b204e9800998ecf8427e        0 contrib/source/Sources
          d41d8cd98f00b204e9800998ecf8427e        0 main/binary-all/Packages
          d41d8cd98f00b204e9800998ecf8427e        0 main/debian-installer/binary-all/Packages
          #{main_amd64_md5sum}     #{main_amd64_size} main/binary-amd64/Packages
          #{main_amd64_di_md5sum}      #{main_amd64_di_size} main/debian-installer/binary-amd64/Packages
          d41d8cd98f00b204e9800998ecf8427e        0 main/binary-arm64/Packages
          d41d8cd98f00b204e9800998ecf8427e        0 main/debian-installer/binary-arm64/Packages
-         #{main_source_md5sum}      #{main_source_size} main/source/Source
+         #{main_sources_md5sum}      #{main_sources_size} main/source/Sources
         SHA256:
          #{contrib_all_sha256}        #{contrib_all_size} contrib/binary-all/Packages
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 contrib/debian-installer/binary-all/Packages
@@ -214,14 +214,14 @@ RSpec.shared_examples 'Generate Debian Distribution and component files' do
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 contrib/debian-installer/binary-amd64/Packages
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 contrib/binary-arm64/Packages
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 contrib/debian-installer/binary-arm64/Packages
-         e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 contrib/source/Source
+         e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 contrib/source/Sources
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 main/binary-all/Packages
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 main/debian-installer/binary-all/Packages
          #{main_amd64_sha256}     #{main_amd64_size} main/binary-amd64/Packages
          #{main_amd64_di_sha256}      #{main_amd64_di_size} main/debian-installer/binary-amd64/Packages
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 main/binary-arm64/Packages
          e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855        0 main/debian-installer/binary-arm64/Packages
-         #{main_source_sha256}      #{main_source_size} main/source/Source
+         #{main_sources_sha256}      #{main_sources_size} main/source/Sources
         EOF
 
         check_release_files(expected_release_content)