sync with upstream sync-status

signadot · Oct 25, 2023 · 7260daf · 7260daf
1 parent 42064c0
commit 7260daf
Show file tree

Hide file tree

Showing 3 changed files with 198 additions and 81 deletions.
diff --git a/generate/swagger.json b/generate/swagger.json
@@ -188,6 +188,21 @@
       },
       "type": "object"
     },
+    "clusters.LastSync": {
+      "properties": {
+        "routegroups": {
+          "$ref": "#/definitions/clusters.SyncCollectionStatus"
+        },
+        "sandboxes": {
+          "$ref": "#/definitions/clusters.SyncCollectionStatus"
+        },
+        "time": {
+          "description": "The time at which the last sync occured.",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
     "clusters.ReadinessStats": {
       "properties": {
         "count": {
@@ -240,18 +255,11 @@
           "type": "string"
         },
         "lastErrorTime": {
-          "description": "The time of the last global error of a sync",
+          "description": "The time of the last global error of a sync.",
           "type": "string"
         },
-        "lastSyncTime": {
-          "description": "The time of the last successful sync.",
-          "type": "string"
-        },
-        "routegroups": {
-          "$ref": "#/definitions/clusters.SyncCollectionStatus"
-        },
-        "sandboxes": {
-          "$ref": "#/definitions/clusters.SyncCollectionStatus"
+        "lastSync": {
+          "$ref": "#/definitions/clusters.LastSync"
         }
       },
       "type": "object"

diff --git a/models/clusters_last_sync.go b/models/clusters_last_sync.go
diff --git a/models/clusters_sync_status.go b/models/clusters_sync_status.go