Merge branch 'generic-packages' into 'master'

Add project level route for generic packages upload

See merge request gitlab-org/gitlab-workhorse!596

changelogs/unreleased/generic-packages.yml

+---
+title: Add project level route for Generic Packages uploads
+merge_request: 596
+author:
+type: added

internal/upstream/routes.go

@@ -223,6 +223,9 @@ func (u *upstream) configureRoutes() {
 		route("PUT", apiPattern+`v4/packages/conan/`, upload.BodyUploader(api, signingProxy, preparers.packages)),
 		route("PUT", apiPattern+`v4/projects/[0-9]+/packages/conan/`, upload.BodyUploader(api, signingProxy, preparers.packages)),
 
+		// Generic Packages Repository
+		route("PUT", apiPattern+`v4/projects/[0-9]+/packages/generic/`, upload.BodyUploader(api, signingProxy, preparers.packages)),
+
 		// NuGet Artifact Repository
 		route("PUT", apiPattern+`v4/projects/[0-9]+/packages/nuget/`, upload.Accelerate(api, signingProxy, preparers.packages)),
 

upload_test.go

@@ -358,6 +358,7 @@ func TestPackageFilesUpload(t *testing.T) {
 		"/api/v4/packages/conan/v1/files",
 		"/api/v4/projects/2412/packages/conan/v1/files",
 		"/api/v4/projects/2412/packages/maven/v1/files",
+		"/api/v4/projects/2412/packages/generic/mypackage/0.0.1/myfile.tar.gz",
 	}
 
 	for _, r := range routes {