Merge branch 'debian_routes_consistency' into 'master'

Remove "/-/" and "incoming/" sections from the debian upload route NO CHANGELOG

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

internal/upstream/routes.go

@@ -262,7 +262,7 @@ func (u *upstream) configureRoutes() {
 		u.route("POST", apiPattern+`v4/projects/[0-9]+/packages/pypi`, upload.Accelerate(api, signingProxy, preparers.packages)),
 
 		// Debian Artifact Repository
-		u.route("PUT", apiPattern+`v4/projects/[0-9]+/-/packages/debian/incoming/`, upload.BodyUploader(api, signingProxy, preparers.packages)),
+		u.route("PUT", apiPattern+`v4/projects/[0-9]+/packages/debian/`, upload.BodyUploader(api, signingProxy, preparers.packages)),
 
 		// We are porting API to disk acceleration
 		// we need to declare each routes until we have fixed all the routes on the rails codebase.

upload_test.go

@@ -428,7 +428,7 @@ func TestPackageFilesUpload(t *testing.T) {
 		"/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",
-		"/api/v4/projects/2412/-/packages/debian/incoming/libsample0_1.2.3~alpha2-1_amd64.deb",
+		"/api/v4/projects/2412/packages/debian/libsample0_1.2.3~alpha2-1_amd64.deb",
 	}
 
 	for _, r := range routes {