feat: preheat compatible with harbor (#837)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Nov 29, 2021 · 3586412 · 3586412
1 parent e226095
commit 3586412
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -4237,7 +4237,7 @@
                 "startTime": {
                     "type": "string"
                 },
-                "state": {
+                "status": {
                     "type": "string"
                 }
             }

diff --git 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
@@ -3839,7 +3839,7 @@ delete role by uri config
 |**finishTime**  <br>*optional*|string|
 |**id**  <br>*optional*|string|
 |**startTime**  <br>*optional*|string|
-|**state**  <br>*optional*|string|
+|**status**  <br>*optional*|string|
 
 
 <a name="types-resetpasswordrequest"></a>

diff --git 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**  <br>*可选*|string|
 |**id**  <br>*可选*|string|
 |**startTime**  <br>*可选*|string|
-|**state**  <br>*可选*|string|
+|**status**  <br>*可选*|string|
 
 
 <a name="types-resetpasswordrequest"></a>

diff --git 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
@@ -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"`
 }