Commit d99aef94 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'helm_workhorse' into 'master'

Add Helm upload routes to workhorse

See merge request gitlab-org/gitlab!60898
parents bf29f197 b1ba1015
...@@ -286,6 +286,9 @@ func configureRoutes(u *upstream) { ...@@ -286,6 +286,9 @@ func configureRoutes(u *upstream) {
// Terraform Module Package Repository // Terraform Module Package Repository
u.route("PUT", apiProjectPattern+`packages/terraform/modules/`, upload.BodyUploader(api, signingProxy, preparers.packages)), u.route("PUT", apiProjectPattern+`packages/terraform/modules/`, upload.BodyUploader(api, signingProxy, preparers.packages)),
// Helm Artifact Repository
u.route("POST", apiProjectPattern+`packages/helm/api/[^/]+/charts\z`, upload.Accelerate(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
......
...@@ -142,6 +142,9 @@ func TestAcceleratedUpload(t *testing.T) { ...@@ -142,6 +142,9 @@ func TestAcceleratedUpload(t *testing.T) {
{"POST", `/api/v4/projects/group%2Fsubgroup%2Fproject/issues/30/metric_images`, true}, {"POST", `/api/v4/projects/group%2Fsubgroup%2Fproject/issues/30/metric_images`, true},
{"POST", `/my/project/-/requirements_management/requirements/import_csv`, true}, {"POST", `/my/project/-/requirements_management/requirements/import_csv`, true},
{"POST", `/my/project/-/requirements_management/requirements/import_csv/`, true}, {"POST", `/my/project/-/requirements_management/requirements/import_csv/`, true},
{"POST", "/api/v4/projects/2412/packages/helm/api/stable/charts", true},
{"POST", "/api/v4/projects/group%2Fproject/packages/helm/api/stable/charts", true},
{"POST", "/api/v4/projects/group%2Fsubgroup%2Fproject/packages/helm/api/stable/charts", true},
} }
for _, tt := range tests { for _, tt := range tests {
...@@ -232,6 +235,8 @@ func TestUnacceleratedUploads(t *testing.T) { ...@@ -232,6 +235,8 @@ func TestUnacceleratedUploads(t *testing.T) {
{"POST", `/api/v4/projects/group/subgroup/project/packages/pypi`}, {"POST", `/api/v4/projects/group/subgroup/project/packages/pypi`},
{"POST", `/api/v4/projects/group/project/packages/pypi`}, {"POST", `/api/v4/projects/group/project/packages/pypi`},
{"POST", `/api/v4/projects/group/subgroup/project/packages/pypi`}, {"POST", `/api/v4/projects/group/subgroup/project/packages/pypi`},
{"POST", "/api/v4/projects/group/project/packages/helm/api/stable/charts"},
{"POST", "/api/v4/projects/group/subgroup%2Fproject/packages/helm/api/stable/charts"},
{"POST", `/api/v4/projects/group/project/issues/30/metric_images`}, {"POST", `/api/v4/projects/group/project/issues/30/metric_images`},
{"POST", `/api/v4/projects/group/subgroup/project/issues/30/metric_images`}, {"POST", `/api/v4/projects/group/subgroup/project/issues/30/metric_images`},
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment