api: backup: auto-inject job id where expected by the API

for backwards compatibility. Otherwise, e.g. listing backup jobs with
pvesh get /cluster/backup is broken. And suddenly not having the
property anymore would be a breaking API change.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>

diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm
index b6f5916d40defaf9cab357a23a24be699fca45b3..3a079874e12c71987c4b08480fb56d8bc4d92640 100644 (file)
--- a/PVE/API2/Backup.pm
+++ b/PVE/API2/Backup.pm
@@ -130,6 +130,10 @@ __PACKAGE__->register_method({
                $job->{'next-run'} = $next_run if defined($next_run);
            }
 
+           # FIXME remove in PVE 8.0?
+           # backwards compat: before moving the job registry to pve-common, id was auto-injected
+           $job->{id} = $jobid;
+
            push @$res, $job;
        }
 
@@ -273,7 +277,12 @@ __PACKAGE__->register_method({
 
        my $jobs_data = cfs_read_file('jobs.cfg');
        my $job = $jobs_data->{ids}->{$param->{id}};
-       return $job if $job && $job->{type} eq 'vzdump';
+       if ($job && $job->{type} eq 'vzdump') {
+           # FIXME remove in PVE 8.0?
+           # backwards compat: before moving the job registry to pve-common, id was auto-injected
+           $job->{id} = $param->{id};
+           return $job;
+       }
 
        raise_param_exc({ id => "No such job '$param->{id}'" });