Skip to content

Commit 65176fd

Browse files
authored
Send correct NuGet status codes (#20647) (#20677)
* Fixed status codes. * Fixed status codes.
1 parent aac905d commit 65176fd

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

integrations/api_packages_nuget_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func TestPackageNuGet(t *testing.T) {
122122

123123
req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content))
124124
req = AddBasicAuthHeader(req, user.Name)
125-
MakeRequest(t, req, http.StatusBadRequest)
125+
MakeRequest(t, req, http.StatusConflict)
126126
})
127127

128128
t.Run("SymbolPackage", func(t *testing.T) {
@@ -208,7 +208,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
208208

209209
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createPackage(packageName, "SymbolsPackage"))
210210
req = AddBasicAuthHeader(req, user.Name)
211-
MakeRequest(t, req, http.StatusBadRequest)
211+
MakeRequest(t, req, http.StatusConflict)
212212
})
213213
})
214214

@@ -352,7 +352,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
352352

353353
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName, packageVersion))
354354
req = AddBasicAuthHeader(req, user.Name)
355-
MakeRequest(t, req, http.StatusOK)
355+
MakeRequest(t, req, http.StatusNoContent)
356356

357357
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNuGet)
358358
assert.NoError(t, err)

routers/api/packages/nuget/nuget.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func UploadPackage(ctx *context.Context) {
215215
)
216216
if err != nil {
217217
if err == packages_model.ErrDuplicatePackageVersion {
218-
apiError(ctx, http.StatusBadRequest, err)
218+
apiError(ctx, http.StatusConflict, err)
219219
return
220220
}
221221
apiError(ctx, http.StatusInternalServerError, err)
@@ -272,7 +272,7 @@ func UploadSymbolPackage(ctx *context.Context) {
272272
case packages_model.ErrPackageNotExist:
273273
apiError(ctx, http.StatusNotFound, err)
274274
case packages_model.ErrDuplicatePackageFile:
275-
apiError(ctx, http.StatusBadRequest, err)
275+
apiError(ctx, http.StatusConflict, err)
276276
default:
277277
apiError(ctx, http.StatusInternalServerError, err)
278278
}
@@ -297,7 +297,7 @@ func UploadSymbolPackage(ctx *context.Context) {
297297
if err != nil {
298298
switch err {
299299
case packages_model.ErrDuplicatePackageFile:
300-
apiError(ctx, http.StatusBadRequest, err)
300+
apiError(ctx, http.StatusConflict, err)
301301
default:
302302
apiError(ctx, http.StatusInternalServerError, err)
303303
}
@@ -412,4 +412,6 @@ func DeletePackage(ctx *context.Context) {
412412
}
413413
apiError(ctx, http.StatusInternalServerError, err)
414414
}
415+
416+
ctx.Status(http.StatusNoContent)
415417
}

0 commit comments

Comments
 (0)