Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

2 files changed, 10 insertions, 5 deletions

diff --git a/app/services/packages/maven/metadata/sync_service.rb b/app/services/packages/maven/metadata/sync_service.rb
index 48e157d4930..4f35db36fb0 100644
--- a/app/services/packages/maven/metadata/sync_service.rb
+++ b/app/services/packages/maven/metadata/sync_service.rb
@@ -93,10 +93,15 @@ module Packages
         def metadata_package_file_for(package)
           return unless package
 
-          package.package_files
-                 .with_file_name(Metadata.filename)
-                 .recent
-                 .first
+          package_files = if Feature.enabled?(:packages_installable_package_files, default_enabled: :yaml)
+                            package.installable_package_files
+                          else
+                            package.package_files
+                          end
+
+          package_files.with_file_name(Metadata.filename)
+                       .recent
+                       .first
         end
 
         def versionless_package_named(name)
diff --git a/app/services/packages/terraform_module/create_package_service.rb b/app/services/packages/terraform_module/create_package_service.rb
index 03f749edfa8..d1bc79089a3 100644
--- a/app/services/packages/terraform_module/create_package_service.rb
+++ b/app/services/packages/terraform_module/create_package_service.rb
@@ -7,7 +7,7 @@ module Packages
 
       def execute
         return error('Version is empty.', 400) if params[:module_version].blank?
-        return error('Package already exists.', 403) if current_package_exists_elsewhere?
+        return error('Access Denied', 403) if current_package_exists_elsewhere?
         return error('Package version already exists.', 403) if current_package_version_exists?
         return error('File is too large.', 400) if file_size_exceeded?