Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e074ee8b
Commit
e074ee8b
authored
Jan 25, 2021
by
Steve Abrams
Committed by
Jacob Vosmaer
Jan 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add RubyGems upload route
Add upload route for RubyGems accelerated uploads.
parent
42e7b65b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
12 deletions
+24
-12
changelogs/unreleased/345-rubygems-route.yml
changelogs/unreleased/345-rubygems-route.yml
+5
-0
internal/upstream/routes.go
internal/upstream/routes.go
+3
-0
upload_test.go
upload_test.go
+16
-12
No files found.
changelogs/unreleased/345-rubygems-route.yml
0 → 100644
View file @
e074ee8b
---
title
:
Add RubyGems registry upload route
merge_request
:
680
author
:
type
:
added
internal/upstream/routes.go
View file @
e074ee8b
...
@@ -264,6 +264,9 @@ func (u *upstream) configureRoutes() {
...
@@ -264,6 +264,9 @@ func (u *upstream) configureRoutes() {
// Debian Artifact Repository
// Debian Artifact Repository
u
.
route
(
"PUT"
,
apiPattern
+
`v4/projects/[0-9]+/packages/debian/`
,
upload
.
BodyUploader
(
api
,
signingProxy
,
preparers
.
packages
)),
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 are porting API to disk acceleration
// we need to declare each routes until we have fixed all the routes on the rails codebase.
// 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
// Overall status can be seen at https://gitlab.com/groups/gitlab-org/-/epics/1802#current-status
...
...
upload_test.go
View file @
e074ee8b
...
@@ -292,9 +292,9 @@ func TestLfsUpload(t *testing.T) {
...
@@ -292,9 +292,9 @@ func TestLfsUpload(t *testing.T) {
require
.
Equal
(
t
,
rspBody
,
string
(
rspData
))
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
)
{
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
(
apiResponse
:=
fmt
.
Sprintf
(
`{"TempPath":%q, "Size": %d}`
,
scratchDir
,
len
(
reqBody
),
`{"TempPath":%q, "Size": %d}`
,
scratchDir
,
len
(
reqBody
),
)
)
...
@@ -330,17 +330,17 @@ func packageUploadTestServer(t *testing.T, resource string, reqBody string, rspB
...
@@ -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"
reqBody
:=
"test data"
rspBody
:=
"test success"
rspBody
:=
"test success"
ts
:=
packageUploadTestServer
(
t
,
resource
,
reqBody
,
rspBody
)
ts
:=
packageUploadTestServer
(
t
,
method
,
resource
,
reqBody
,
rspBody
)
defer
ts
.
Close
()
defer
ts
.
Close
()
ws
:=
startWorkhorseServer
(
ts
.
URL
)
ws
:=
startWorkhorseServer
(
ts
.
URL
)
defer
ws
.
Close
()
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
)
require
.
NoError
(
t
,
err
)
resp
,
err
:=
http
.
DefaultClient
.
Do
(
req
)
resp
,
err
:=
http
.
DefaultClient
.
Do
(
req
)
...
@@ -355,15 +355,19 @@ func testPackageFileUpload(t *testing.T, resource string) {
...
@@ -355,15 +355,19 @@ func testPackageFileUpload(t *testing.T, resource string) {
}
}
func
TestPackageFilesUpload
(
t
*
testing
.
T
)
{
func
TestPackageFilesUpload
(
t
*
testing
.
T
)
{
routes
:=
[]
string
{
routes
:=
[]
struct
{
"/api/v4/packages/conan/v1/files"
,
method
string
"/api/v4/projects/2412/packages/conan/v1/files"
,
resource
string
"/api/v4/projects/2412/packages/maven/v1/files"
,
}{
"/api/v4/projects/2412/packages/generic/mypackage/0.0.1/myfile.tar.gz"
,
{
"PUT"
,
"/api/v4/packages/conan/v1/files"
},
"/api/v4/projects/2412/packages/debian/libsample0_1.2.3~alpha2-1_amd64.deb"
,
{
"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
{
for
_
,
r
:=
range
routes
{
testPackageFileUpload
(
t
,
r
)
testPackageFileUpload
(
t
,
r
.
method
,
r
.
resource
)
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment