From abfdbe924f74a98beed36a280240ddf997798c08 Mon Sep 17 00:00:00 2001 From: Gaius Date: Mon, 29 Nov 2021 20:59:34 +0800 Subject: [PATCH] feat: preheat compatible with harbor (#837) Signed-off-by: Gaius --- api/manager/docs.go | 2 +- api/manager/swagger.json | 2 +- api/manager/swagger.yaml | 2 +- docs/en/api-reference/api-reference.md | 2 +- docs/zh-CN/api-reference/api-reference.md | 2 +- manager/service/preheat.go | 2 +- manager/types/preheat.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/manager/docs.go b/api/manager/docs.go index cd0518388..2b552199c 100644 --- a/api/manager/docs.go +++ b/api/manager/docs.go @@ -4251,7 +4251,7 @@ var doc = `{ "startTime": { "type": "string" }, - "state": { + "status": { "type": "string" } } diff --git a/api/manager/swagger.json b/api/manager/swagger.json index 829403a0c..1dfc673b5 100644 --- a/api/manager/swagger.json +++ b/api/manager/swagger.json @@ -4237,7 +4237,7 @@ "startTime": { "type": "string" }, - "state": { + "status": { "type": "string" } } diff --git a/api/manager/swagger.yaml b/api/manager/swagger.yaml index 9f0434e34..7aeab1e4f 100644 --- a/api/manager/swagger.yaml +++ b/api/manager/swagger.yaml @@ -527,7 +527,7 @@ definitions: type: string startTime: type: string - state: + status: type: string type: object types.ResetPasswordRequest: diff --git a/docs/en/api-reference/api-reference.md b/docs/en/api-reference/api-reference.md index d13240f52..db7a5597e 100644 --- a/docs/en/api-reference/api-reference.md +++ b/docs/en/api-reference/api-reference.md @@ -3839,7 +3839,7 @@ delete role by uri config |**finishTime**
*optional*|string| |**id**
*optional*|string| |**startTime**
*optional*|string| -|**state**
*optional*|string| +|**status**
*optional*|string| diff --git a/docs/zh-CN/api-reference/api-reference.md b/docs/zh-CN/api-reference/api-reference.md index 1a9fa135d..cafa34538 100644 --- a/docs/zh-CN/api-reference/api-reference.md +++ b/docs/zh-CN/api-reference/api-reference.md @@ -3839,7 +3839,7 @@ delete role by uri config |**finishTime**
*可选*|string| |**id**
*可选*|string| |**startTime**
*可选*|string| -|**state**
*可选*|string| +|**status**
*可选*|string| diff --git a/manager/service/preheat.go b/manager/service/preheat.go index ad90e401d..b17d102b8 100644 --- a/manager/service/preheat.go +++ b/manager/service/preheat.go @@ -76,7 +76,7 @@ func (s *rest) GetV1Preheat(ctx context.Context, rawID string) (*types.GetV1Preh return &types.GetV1PreheatResponse{ ID: strconv.FormatUint(uint64(job.ID), 10), - State: convertState(job.State), + Status: convertState(job.State), StartTime: job.CreatedAt.String(), FinishTime: job.UpdatedAt.String(), }, nil diff --git a/manager/types/preheat.go b/manager/types/preheat.go index 080131573..930de0c8a 100644 --- a/manager/types/preheat.go +++ b/manager/types/preheat.go @@ -29,7 +29,7 @@ type CreateV1PreheatResponse struct { type GetV1PreheatResponse struct { ID string `json:"id"` - State string `json:"state"` + Status string `json:"status"` StartTime string `json:"startTime,omitempty"` FinishTime string `json:"finishTime,omitempty"` }