Add latest changes from gitlab-org/gitlab@master

GITLAB_KAS_VERSION

@@ -1 +1 @@
-9b377d750f688c59510996f758ffa8033b687571
+da6bcc470bd3972caf22986af06b3c5b1254e803

app/models/packages/composer/package.rb

@@ -7,7 +7,7 @@ module Packages
 
       has_one :composer_metadatum, inverse_of: :package, class_name: 'Packages::Composer::Metadatum'
 
-      delegate :target_sha, to: :composer_metadatum
+      delegate :target_sha, :composer_json, to: :composer_metadatum, allow_nil: true
 
       validate :valid_composer_global_name
       validates :version, format: { with: Gitlab::Regex.semver_regex, message: Gitlab::Regex.semver_regex_message },

lib/gitlab/composer/version_index.rb

@@ -26,7 +26,7 @@ module Gitlab
       end
 
       def package_metadata(package)
-        json = package.composer_metadatum.composer_json
+        json = package.composer_json
 
         json.merge(
           'dist' => package_dist(package),

spec/factories/packages/composer/packages.rb

@@ -7,7 +7,11 @@ FactoryBot.define do
     package_type { :composer }
 
     transient do
-      sha { project.repository.find_branch('master').target }
+      sha do
+        project&.repository&.find_branch('master')&.target || OpenSSL::Digest.hexdigest('SHA1', SecureRandom.hex)
+      rescue Gitlab::Git::Repository::NoRepository
+        OpenSSL::Digest.hexdigest('SHA1', SecureRandom.hex)
+      end
       json { { name: name, version: version } }
     end
 

spec/models/packages/composer/package_spec.rb

@@ -8,7 +8,8 @@ RSpec.describe Packages::Composer::Package, type: :model, feature_category: :pac
   end
 
   describe 'delegates' do
-    it { is_expected.to delegate_method(:target_sha).to(:composer_metadatum) }
+    it { is_expected.to delegate_method(:target_sha).to(:composer_metadatum).allow_nil }
+    it { is_expected.to delegate_method(:composer_json).to(:composer_metadatum).allow_nil }
   end
 
   describe 'validations' do

spec/services/packages/composer/create_package_service_spec.rb

@@ -35,8 +35,8 @@ RSpec.describe Packages::Composer::CreatePackageService, feature_category: :pack
 
           expect(created_package.name).to eq package_name
           expect(created_package.version).to eq 'dev-master'
-          expect(created_package.composer_metadatum.target_sha).to eq branch.target
-          expect(created_package.composer_metadatum.composer_json.to_json).to eq json
+          expect(created_package.target_sha).to eq branch.target
+          expect(created_package.composer_json.to_json).to eq json
         end
 
         it_behaves_like 'assigns the package creator' do