Skip to content

Commit 99fc419

Browse files
authored
Send correct NuGet status codes (#20647)
* Fixed status codes. * Fixed status codes.
1 parent 7a31292 commit 99fc419

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

integrations/api_packages_nuget_test.go

Lines changed: 3 additions & 3 deletions
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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func UploadPackage(ctx *context.Context) {
217217
)
218218
if err != nil {
219219
if err == packages_model.ErrDuplicatePackageVersion {
220-
apiError(ctx, http.StatusBadRequest, err)
220+
apiError(ctx, http.StatusConflict, err)
221221
return
222222
}
223223
apiError(ctx, http.StatusInternalServerError, err)
@@ -274,7 +274,7 @@ func UploadSymbolPackage(ctx *context.Context) {
274274
case packages_model.ErrPackageNotExist:
275275
apiError(ctx, http.StatusNotFound, err)
276276
case packages_model.ErrDuplicatePackageFile:
277-
apiError(ctx, http.StatusBadRequest, err)
277+
apiError(ctx, http.StatusConflict, err)
278278
default:
279279
apiError(ctx, http.StatusInternalServerError, err)
280280
}
@@ -299,7 +299,7 @@ func UploadSymbolPackage(ctx *context.Context) {
299299
if err != nil {
300300
switch err {
301301
case packages_model.ErrDuplicatePackageFile:
302-
apiError(ctx, http.StatusBadRequest, err)
302+
apiError(ctx, http.StatusConflict, err)
303303
default:
304304
apiError(ctx, http.StatusInternalServerError, err)
305305
}
@@ -414,4 +414,6 @@ func DeletePackage(ctx *context.Context) {
414414
}
415415
apiError(ctx, http.StatusInternalServerError, err)
416416
}
417+
418+
ctx.Status(http.StatusNoContent)
417419
}

0 commit comments

Comments
 (0)