Merge pull request #3 from beclab/fix/modify-fields

fixed: adjusted the field content of the interface return data
beclab · May 17, 2024 · d5e8571 · d5e8571
2 parents 9432e45 + 4e649ed
commit d5e8571
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/pkg/modules/backup/v1/backup_schedule.go b/pkg/modules/backup/v1/backup_schedule.go
@@ -270,7 +270,7 @@ func (o *BackupPlan) hasInProgressBackup(ctx context.Context) (bool, error) {
 // 	return nil
 // }
 
-func (o *BackupPlan) GetLatest(ctx context.Context, name string) (*ListBackupsDetails, error) {
+func (o *BackupPlan) GetLatest(ctx context.Context, name string) (*ResponseDescribeBackup, error) {
 	bc, err := o.manager.GetBackupConfig(ctx, name)
 	if err != nil {
 		return nil, err
@@ -280,8 +280,9 @@ func (o *BackupPlan) GetLatest(ctx context.Context, name string) (*ListBackupsDe
 		log.Errorf("convert time to timestamp error: %v", err)
 	}
 
-	rs := ListBackupsDetails{
+	rs := ResponseDescribeBackup{
 		Name:              name,
+		BackupPolicies:    bc.Spec.BackupPolicy,
 		SnapshotFrequency: bc.Spec.BackupPolicy.SnapshotFrequency,
 	}
 

diff --git a/pkg/modules/backup/v1/handler.go b/pkg/modules/backup/v1/handler.go
@@ -87,10 +87,10 @@ func (h *Handler) list(req *restful.Request, resp *restful.Response) {
 		return
 	}
 
-	var res []*ListBackupsDetails
+	var res []*ResponseDescribeBackup
 
 	for _, b := range l.Items {
-		var r *ListBackupsDetails
+		var r *ResponseDescribeBackup
 		r, err = NewBackupPlan(owner, h.factory, h.veleroBackupManager).GetLatest(ctx, b.Name)
 		if err != nil {
 			log.Warnf("failed to get backup plan %q: %v", b.Name, err)

diff --git a/pkg/modules/backup/v1/model.go b/pkg/modules/backup/v1/model.go
@@ -105,6 +105,19 @@ type ResponseDescribeBackup struct {
 	BackupPolicies *sysv1.BackupPolicy `json:"backupPolicies"`
 
 	Snapshots []Snapshot `json:"snapshots,omitempty"`
+
+	// new list api fields
+	SnapshotName string `json:"latestSnapshotName"`
+
+	SnapshotFrequency string `json:"snapshotFrequency"`
+
+	CreationTimestamp int64 `json:"creationTimestamp,omitempty"`
+
+	NextBackupTimestamp *int64 `json:"nextBackupTimestamp,omitempty"`
+
+	Phase string `json:"phase,omitempty"`
+
+	FailedMessage string `json:"failedMessage,omitempty"`
 }
 
 type PostBackupSchedule struct {