diff --git a/docs/docs.go b/docs/docs.go index ebd011f6..2c9331ca 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -546,7 +546,7 @@ const docTemplate = `{ } } }, - "/api/v3/fs/disk/": { + "/api/v3/fs/disk": { "get": { "security": [ { @@ -731,7 +731,7 @@ const docTemplate = `{ } } }, - "/api/v3/fs/mem/": { + "/api/v3/fs/mem": { "get": { "security": [ { @@ -1141,21 +1141,33 @@ const docTemplate = `{ "parameters": [ { "type": "string", - "description": "Comma separated list of fields (config, state, report, metadata) that will be part of the output. If empty, all fields will be part of the output", + "description": "Comma separated list of fields (config, state, report, metadata) that will be part of the output. If empty, all fields will be part of the output.", "name": "filter", "in": "query" }, { "type": "string", - "description": "Return only these process that have this reference value. Overrides a list of IDs. If empty, the reference will be ignored", + "description": "Return only these process that have this reference value. If empty, the reference will be ignored.", "name": "reference", "in": "query" }, { "type": "string", - "description": "Comma separated list of process ids to list", + "description": "Comma separated list of process ids to list. Overrides the reference. If empty all IDs will be returned.", "name": "id", "in": "query" + }, + { + "type": "string", + "description": "Glob pattern for process IDs. If empty all IDs will be returned. Intersected with results from refpattern.", + "name": "idpattern", + "in": "query" + }, + { + "type": "string", + "description": "Glob pattern for process references. If empty all IDs will be returned. Intersected with results from idpattern.", + "name": "refpattern", + "in": "query" } ], "responses": { diff --git a/docs/swagger.json b/docs/swagger.json index f969770c..d3246920 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -538,7 +538,7 @@ } } }, - "/api/v3/fs/disk/": { + "/api/v3/fs/disk": { "get": { "security": [ { @@ -723,7 +723,7 @@ } } }, - "/api/v3/fs/mem/": { + "/api/v3/fs/mem": { "get": { "security": [ { @@ -1133,21 +1133,33 @@ "parameters": [ { "type": "string", - "description": "Comma separated list of fields (config, state, report, metadata) that will be part of the output. If empty, all fields will be part of the output", + "description": "Comma separated list of fields (config, state, report, metadata) that will be part of the output. If empty, all fields will be part of the output.", "name": "filter", "in": "query" }, { "type": "string", - "description": "Return only these process that have this reference value. Overrides a list of IDs. If empty, the reference will be ignored", + "description": "Return only these process that have this reference value. If empty, the reference will be ignored.", "name": "reference", "in": "query" }, { "type": "string", - "description": "Comma separated list of process ids to list", + "description": "Comma separated list of process ids to list. Overrides the reference. If empty all IDs will be returned.", "name": "id", "in": "query" + }, + { + "type": "string", + "description": "Glob pattern for process IDs. If empty all IDs will be returned. Intersected with results from refpattern.", + "name": "idpattern", + "in": "query" + }, + { + "type": "string", + "description": "Glob pattern for process references. If empty all IDs will be returned. Intersected with results from idpattern.", + "name": "refpattern", + "in": "query" } ], "responses": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index bb5e1bea..20af5f31 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2084,7 +2084,7 @@ paths: security: - ApiKeyAuth: [] summary: Reload the currently active configuration - /api/v3/fs/disk/: + /api/v3/fs/disk: get: description: List all files on the filesystem. The listing can be ordered by name, size, or date of last modification in ascending or descending order. @@ -2205,7 +2205,7 @@ paths: security: - ApiKeyAuth: [] summary: Add a file to the filesystem - /api/v3/fs/mem/: + /api/v3/fs/mem: get: description: List all files on the memory filesystem. The listing can be ordered by name, size, or date of last modification in ascending or descending order. @@ -2471,19 +2471,30 @@ paths: parameters: - description: Comma separated list of fields (config, state, report, metadata) that will be part of the output. If empty, all fields will be part of the - output + output. in: query name: filter type: string - - description: Return only these process that have this reference value. Overrides - a list of IDs. If empty, the reference will be ignored + - description: Return only these process that have this reference value. If + empty, the reference will be ignored. in: query name: reference type: string - - description: Comma separated list of process ids to list + - description: Comma separated list of process ids to list. Overrides the reference. + If empty all IDs will be returned. in: query name: id type: string + - description: Glob pattern for process IDs. If empty all IDs will be returned. + Intersected with results from refpattern. + in: query + name: idpattern + type: string + - description: Glob pattern for process references. If empty all IDs will be + returned. Intersected with results from idpattern. + in: query + name: refpattern + type: string produces: - application/json responses: diff --git a/http/handler/api/diskfs.go b/http/handler/api/diskfs.go index 7234680c..c143619d 100644 --- a/http/handler/api/diskfs.go +++ b/http/handler/api/diskfs.go @@ -160,7 +160,7 @@ func (h *DiskFSHandler) DeleteFile(c echo.Context) error { // @Param order query string false "asc, desc" // @Success 200 {array} api.FileInfo // @Security ApiKeyAuth -// @Router /api/v3/fs/disk/ [get] +// @Router /api/v3/fs/disk [get] func (h *DiskFSHandler) ListFiles(c echo.Context) error { pattern := util.DefaultQuery(c, "glob", "") sortby := util.DefaultQuery(c, "sort", "none") diff --git a/http/handler/api/memfs.go b/http/handler/api/memfs.go index bef90dd7..2c6bd101 100644 --- a/http/handler/api/memfs.go +++ b/http/handler/api/memfs.go @@ -125,7 +125,7 @@ func (h *MemFSHandler) PatchFile(c echo.Context) error { // @Param order query string false "asc, desc" // @Success 200 {array} api.FileInfo // @Security ApiKeyAuth -// @Router /api/v3/fs/mem/ [get] +// @Router /api/v3/fs/mem [get] func (h *MemFSHandler) ListFiles(c echo.Context) error { pattern := util.DefaultQuery(c, "glob", "") sortby := util.DefaultQuery(c, "sort", "none")