Merge branch 'master' into 'master'

file_metadatum: Add conan_sources.tgz filename

See merge request gitlab-org/gitlab!32664

ee/app/models/packages/conan/file_metadatum.rb

@@ -18,7 +18,7 @@ class Packages::Conan::FileMetadatum < ApplicationRecord
 
   enum conan_file_type: { recipe_file: 1, package_file: 2 }
 
-  RECIPE_FILES = %w[conanfile.py conanmanifest.txt].freeze
+  RECIPE_FILES = %w[conanfile.py conanmanifest.txt conan_sources.tgz].freeze
   PACKAGE_FILES = %w[conaninfo.txt conanmanifest.txt conan_package.tgz].freeze
   PACKAGE_BINARY = 'conan_package.tgz'
 

ee/changelogs/unreleased-ee/conan_sources_upload_url.yml

+---
+title: "Fix Conan upload URL for conan_sources.tgz"
+merge_request: 32664
+author: Zach Hilman
+type: fixed

ee/spec/requests/api/conan_packages_spec.rb

@@ -419,7 +419,8 @@ describe API::ConanPackages do
 
       let(:params) do
         { "conanfile.py": 24,
-          "conanmanifext.txt": 123 }
+          "conanmanifext.txt": 123,
+          "conan_sources.tgz": 523 }
       end
 
       subject { post api("/packages/conan/v1/conans/#{recipe_path}/upload_urls"), params: params, headers: headers }
@@ -431,7 +432,8 @@ describe API::ConanPackages do
 
         expected_response = {
           'conanfile.py':      "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanfile.py",
-          'conanmanifest.txt': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanmanifest.txt"
+          'conanmanifest.txt': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanmanifest.txt",
+          'conan_sources.tgz': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conan_sources.tgz"
         }
 
         expect(response.body).to eq(expected_response.to_json)