proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-07-15 09:57:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

domains: dry-run: adapt log messages and improve variable name

Browse Source 
keep variable names aligned with the params the relate to, "write"
was quite ambiguous too (write what?)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-04-25 18:55:35 +02:00
parent 6c42a1034b
commit 417309d71c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/API2/Domains.pm
View File

@ -427,9 +427,7 @@ __PACKAGE__->register_method ({
my $rpcenv = PVE::RPCEnvironment::get(); my $rpcenv = PVE::RPCEnvironment::get();
my $authuser = $rpcenv->get_user(); my $authuser = $rpcenv->get_user();
my $write = !(extract_param($param, 'dry-run')); my $dry_run = extract_param($param, 'dry-run');
my $dryrunstring = $write ? '' : ' (dry run)';
my $realm = $param->{realm}; my $realm = $param->{realm};
my $cfg = cfs_read_file($domainconfigfile); my $cfg = cfs_read_file($domainconfigfile);
my $realmconfig = $cfg->{ids}->{$realm}; my $realmconfig = $cfg->{ids}->{$realm};
@ -449,7 +447,8 @@ __PACKAGE__->register_method ({
my $plugin = PVE::Auth::Plugin->lookup($type); my $plugin = PVE::Auth::Plugin->lookup($type);
my $worker = sub { my $worker = sub {
print "starting sync$dryrunstring for realm $realm\n"; print "(dry test run) " if $dry_run;
print "starting sync for realm $realm\n";
my ($synced_users, $dnmap) = $plugin->get_users($realmconfig, $realm); my ($synced_users, $dnmap) = $plugin->get_users($realmconfig, $realm);
my $synced_groups = {}; my $synced_groups = {};
@ -469,16 +468,16 @@ __PACKAGE__->register_method ({
$update_groups->($usercfg, $realm, $synced_groups, $opts); $update_groups->($usercfg, $realm, $synced_groups, $opts);
} }
if ($write) { if ($dry_run) {
cfs_write_file("user.cfg", $usercfg) if $write; print "\nNOTE: Dry test run, changes were NOT written to the configuration.\n";
print "successfully updated $whatstring configuration\n" if $write; return;
} else {
print "NOTE: This is just a dry run. No actual data was written.\n";
} }
cfs_write_file("user.cfg", $usercfg);
print "successfully updated $whatstring configuration\n";
}, "syncing $whatstring failed"); }, "syncing $whatstring failed");
}; };
my $workerid = $write ? 'auth-realm-sync' : 'auth-realm-sync-test'; my $workerid = !$dry_run ? 'auth-realm-sync' : 'auth-realm-sync-test';
return $rpcenv->fork_worker($workerid, $realm, $authuser, $worker); return $rpcenv->fork_worker($workerid, $realm, $authuser, $worker);
}}); }});