diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index fed42d7550..04c3935d0a 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -11766,14 +11766,14 @@ const docTemplate = `{ "codersdk.AIBridgeListInterceptionsResponse": { "type": "object", "properties": { + "count": { + "type": "integer" + }, "results": { "type": "array", "items": { "$ref": "#/definitions/codersdk.AIBridgeInterception" } - }, - "total": { - "type": "integer" } } }, diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 6b37aa45c7..c1c6fd2d23 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -10462,14 +10462,14 @@ "codersdk.AIBridgeListInterceptionsResponse": { "type": "object", "properties": { + "count": { + "type": "integer" + }, "results": { "type": "array", "items": { "$ref": "#/definitions/codersdk.AIBridgeInterception" } - }, - "total": { - "type": "integer" } } }, diff --git a/codersdk/aibridge.go b/codersdk/aibridge.go index 0a6e85c947..afe0e19f78 100644 --- a/codersdk/aibridge.go +++ b/codersdk/aibridge.go @@ -56,7 +56,7 @@ type AIBridgeToolUsage struct { } type AIBridgeListInterceptionsResponse struct { - Total int64 `json:"total"` + Count int64 `json:"count"` Results []AIBridgeInterception `json:"results"` } diff --git a/docs/reference/api/aibridge.md b/docs/reference/api/aibridge.md index 54f408ec23..2a2dd16ea9 100644 --- a/docs/reference/api/aibridge.md +++ b/docs/reference/api/aibridge.md @@ -28,6 +28,7 @@ curl -X GET http://coder-server:8080/api/v2/api/experimental/aibridge/intercepti ```json { + "count": 0, "results": [ { "id": "497f6eca-6276-4993-bfeb-53cbbbba6f08", @@ -89,8 +90,7 @@ curl -X GET http://coder-server:8080/api/v2/api/experimental/aibridge/intercepti } ] } - ], - "total": 0 + ] } ``` diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md index 86efc00f52..cd0daad963 100644 --- a/docs/reference/api/schemas.md +++ b/docs/reference/api/schemas.md @@ -515,6 +515,7 @@ ```json { + "count": 0, "results": [ { "id": "497f6eca-6276-4993-bfeb-53cbbbba6f08", @@ -576,8 +577,7 @@ } ] } - ], - "total": 0 + ] } ``` @@ -585,8 +585,8 @@ | Name | Type | Required | Restrictions | Description | |-----------|-------------------------------------------------------------------------|----------|--------------|-------------| +| `count` | integer | false | | | | `results` | array of [codersdk.AIBridgeInterception](#codersdkaibridgeinterception) | false | | | -| `total` | integer | false | | | ## codersdk.AIBridgeOpenAIConfig diff --git a/enterprise/coderd/aibridge.go b/enterprise/coderd/aibridge.go index 2c28745c95..dab93d8992 100644 --- a/enterprise/coderd/aibridge.go +++ b/enterprise/coderd/aibridge.go @@ -127,7 +127,7 @@ func (api *API) aiBridgeListInterceptions(rw http.ResponseWriter, r *http.Reques } httpapi.Write(ctx, rw, http.StatusOK, codersdk.AIBridgeListInterceptionsResponse{ - Total: count, + Count: count, Results: items, }) } diff --git a/enterprise/coderd/aibridge_test.go b/enterprise/coderd/aibridge_test.go index 232cfd7072..5de1df5b60 100644 --- a/enterprise/coderd/aibridge_test.go +++ b/enterprise/coderd/aibridge_test.go @@ -269,7 +269,7 @@ func TestAIBridgeListInterceptions(t *testing.T) { if len(res.Results) == 0 { break } - require.EqualValues(t, len(allInterceptionIDs), res.Total) + require.EqualValues(t, len(allInterceptionIDs), res.Count) require.Len(t, res.Results, 1) interceptionIDs = append(interceptionIDs, res.Results[0].ID) } @@ -322,7 +322,7 @@ func TestAIBridgeListInterceptions(t *testing.T) { // Admin can see all interceptions. res, err := adminExperimentalClient.AIBridgeListInterceptions(ctx, codersdk.AIBridgeListInterceptionsFilter{}) require.NoError(t, err) - require.EqualValues(t, 2, res.Total) + require.EqualValues(t, 2, res.Count) require.Len(t, res.Results, 2) require.Equal(t, i1.ID, res.Results[0].ID) require.Equal(t, i2.ID, res.Results[1].ID) @@ -330,7 +330,7 @@ func TestAIBridgeListInterceptions(t *testing.T) { // Second user can only see their own interceptions. res, err = secondUserExperimentalClient.AIBridgeListInterceptions(ctx, codersdk.AIBridgeListInterceptionsFilter{}) require.NoError(t, err) - require.EqualValues(t, 1, res.Total) + require.EqualValues(t, 1, res.Count) require.Len(t, res.Results, 1) require.Equal(t, i2.ID, res.Results[0].ID) }) @@ -501,7 +501,7 @@ func TestAIBridgeListInterceptions(t *testing.T) { ctx := testutil.Context(t, testutil.WaitLong) res, err := experimentalClient.AIBridgeListInterceptions(ctx, tc.filter) require.NoError(t, err) - require.EqualValues(t, len(tc.want), res.Total) + require.EqualValues(t, len(tc.want), res.Count) // We just compare UUID strings for the sake of this test. wantIDs := make([]string, len(tc.want)) for i, r := range tc.want { diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index f5e11dbefc..449fc01d55 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -39,7 +39,7 @@ export interface AIBridgeInterception { // From codersdk/aibridge.go export interface AIBridgeListInterceptionsResponse { - readonly total: number; + readonly count: number; readonly results: readonly AIBridgeInterception[]; }