Merge branch '345-rubygems-route' into 'master'

Add RubyGems artifact upload route

Closes #345

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

changelogs/unreleased/345-rubygems-route.yml

+---
+title: Add RubyGems registry upload route
+merge_request: 680
+author:
+type: added

internal/upstream/routes.go

@@ -264,6 +264,9 @@ func (u *upstream) configureRoutes() {
 		// Debian Artifact Repository
 		u.route("PUT", apiPattern+`v4/projects/[0-9]+/packages/debian/`, upload.BodyUploader(api, signingProxy, preparers.packages)),
 
+		// Gem Artifact Repository
+		u.route("POST", apiPattern+`v4/projects/[0-9]+/packages/rubygems/`, 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.
 		// Overall status can be seen at https://gitlab.com/groups/gitlab-org/-/epics/1802#current-status

upload_test.go

@@ -292,9 +292,9 @@ func TestLfsUpload(t *testing.T) {
 	require.Equal(t, rspBody, string(rspData))
 }
 
-func packageUploadTestServer(t *testing.T, resource string, reqBody string, rspBody string) *httptest.Server {
+func packageUploadTestServer(t *testing.T, method string, resource string, reqBody string, rspBody string) *httptest.Server {
 	return testhelper.TestServerWithHandler(regexp.MustCompile(`.`), func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, r.Method, "PUT")
+		require.Equal(t, r.Method, method)
 		apiResponse := fmt.Sprintf(
 			`{"TempPath":%q, "Size": %d}`, scratchDir, len(reqBody),
 		)
@@ -330,17 +330,17 @@ func packageUploadTestServer(t *testing.T, resource string, reqBody string, rspB
 	})
 }
 
-func testPackageFileUpload(t *testing.T, resource string) {
+func testPackageFileUpload(t *testing.T, method string, resource string) {
 	reqBody := "test data"
 	rspBody := "test success"
 
-	ts := packageUploadTestServer(t, resource, reqBody, rspBody)
+	ts := packageUploadTestServer(t, method, resource, reqBody, rspBody)
 	defer ts.Close()
 
 	ws := startWorkhorseServer(ts.URL)
 	defer ws.Close()
 
-	req, err := http.NewRequest("PUT", ws.URL+resource, strings.NewReader(reqBody))
+	req, err := http.NewRequest(method, ws.URL+resource, strings.NewReader(reqBody))
 	require.NoError(t, err)
 
 	resp, err := http.DefaultClient.Do(req)
@@ -355,15 +355,19 @@ func testPackageFileUpload(t *testing.T, resource string) {
 }
 
 func TestPackageFilesUpload(t *testing.T) {
-	routes := []string{
-		"/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",
-		"/api/v4/projects/2412/packages/debian/libsample0_1.2.3~alpha2-1_amd64.deb",
+	routes := []struct {
+		method   string
+		resource string
+	}{
+		{"PUT", "/api/v4/packages/conan/v1/files"},
+		{"PUT", "/api/v4/projects/2412/packages/conan/v1/files"},
+		{"PUT", "/api/v4/projects/2412/packages/maven/v1/files"},
+		{"PUT", "/api/v4/projects/2412/packages/generic/mypackage/0.0.1/myfile.tar.gz"},
+		{"PUT", "/api/v4/projects/2412/packages/debian/libsample0_1.2.3~alpha2-1_amd64.deb"},
+		{"POST", "/api/v4/projects/2412/packages/rubygems/api/v1/gems/sample.gem"},
 	}
 
 	for _, r := range routes {
-		testPackageFileUpload(t, r)
+		testPackageFileUpload(t, r.method, r.resource)
 	}
 }