Merge pull request #1064 from joyent/ether/v3.0.7-fixes

v3.0.7 misc fixes
joyent · Nov 16, 2020 · eff7296 · eff7296
2 parents b150e2d + 2381db4
commit eff7296
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 104 deletions.
diff --git a/docs/modules/Conch::Command::new_organizations.md b/docs/modules/Conch::Command::new_organizations.md
diff --git a/docs/modules/index.md b/docs/modules/index.md
@@ -8,7 +8,6 @@
 * [Conch::Command::create_user](../modules/Conch::Command::create_user)
 * [Conch::Command::fix_usernames](../modules/Conch::Command::fix_usernames)
 * [Conch::Command::force_password_change](../modules/Conch::Command::force_password_change)
-* [Conch::Command::new_organizations](../modules/Conch::Command::new_organizations)
 * [Conch::Command::passwd](../modules/Conch::Command::passwd)
 * [Conch::Command::thin_device_reports](../modules/Conch::Command::thin_device_reports)
 * [Conch::Command::update_validation_plans](../modules/Conch::Command::update_validation_plans)

diff --git a/docs/scripts/conch.md b/docs/scripts/conch.md
@@ -44,10 +44,6 @@ Conch-specific commands are:
 
     force a user (or by default, all users) to change their password
 
-- [new\_organizations](../modules/Conch%3A%3ACommand%3A%3Anew_organizations)
-
-    create new organization data
-
 - [passwd](../modules/Conch%3A%3ACommand%3A%3Apasswd)
 
     Change a user's password

diff --git a/lib/Conch/Command/fix_usernames.pm b/lib/Conch/Command/fix_usernames.pm
@@ -28,7 +28,7 @@ sub run ($self, @opts) {
     my ($opt, $usage) = describe_options(
         # the descriptions aren't actually used anymore (mojo uses the synopsis instead)... but
         # the 'usage' text block can be accessed with $usage->text
-        'clean_roles %o',
+        'fix_usernames %o',
         [ 'dry-run|n',      'dry-run (no changes are made)' ],
         [],
         [ 'help',           'print usage message and exit', { shortcircuit => 1 } ],

diff --git a/lib/Conch/Command/force_password_change.pm b/lib/Conch/Command/force_password_change.pm
@@ -29,7 +29,7 @@ sub run ($self, @opts) {
     my ($opt, $usage) = describe_options(
         # the descriptions aren't actually used anymore (mojo uses the synopsis instead)... but
         # the 'usage' text block can be accessed with $usage->text
-        'clean_roles %o',
+        'force_password_change %o',
         [ 'dry-run|n',      'dry-run (no changes are made)' ],
         [ 'email=s@',       'email address of user to be modified (can be used more than once)' ],
         [],

diff --git a/lib/Conch/Command/new_organizations.pm b/lib/Conch/Command/new_organizations.pm
diff --git a/lib/Conch/Command/thin_device_reports.pm b/lib/Conch/Command/thin_device_reports.pm
@@ -86,7 +86,7 @@ sub run ($self, @opts) {
     }
 
     say "\n$device_count devices processed.";
-    say $device_reports_deleted.' device_reports deleted.' if $device_reports_deleted;
+    say $device_reports_deleted.' device_reports '.($self->dry_run ? 'would be ' : '').'deleted.' if $device_reports_deleted;
     say $validation_results_deleted.' validation_results deleted.' if $validation_results_deleted;
 
     say 'at finish, we have this many records:';
@@ -98,10 +98,14 @@ sub _print_stats ($self) {
     say 'validation_state:        ', $self->app->db_ro_validation_states->count;
     say 'validation_state_member: ', $self->app->db_ro_validation_state_members->count;
     say 'validation_result:       ', $self->app->db_ro_validation_results->count;
+    say '';
 }
 
 sub _process_device ($self, $device) {
-    my $report_count = 0;
+    my $report_count = $self->app->db_device_reports
+        ->search({ 'device_report.device_id' => $device->id })
+        ->count;
+
     print 'device id ', $device->id, ': ';
 
     my $query = <<'SQL';
@@ -131,7 +135,7 @@ SQL
         ->search({ 'device_report.id' => { -in => \[ $query, $device->id ] } });
 
     my $device_reports_deleted;
-    my $validation_results_deleted;
+    my $validation_results_deleted = 0;
 
     print "\n";
 
@@ -150,7 +154,7 @@ SQL
             ' out of ', $report_count, ' examined';
 
         # now delete all newly-orphaned validation_result rows for this device
-        $validation_results_deleted = $device->delete_related('validation_results',
+        $validation_results_deleted += $device->delete_related('validation_results',
             { 'validation_state_members.validation_state_id' => undef },
             { join => 'validation_state_members' },
         );

diff --git a/lib/Conch/Plugin/Rollbar.pm b/lib/Conch/Plugin/Rollbar.pm
@@ -102,7 +102,7 @@ message is sent to Rollbar.
         delete $data->@{qw(level msg)};
         $c->send_message_to_rollbar('error', 'api error', $data);
     })
-    if $config->{rollbar}{error_match_header}->%*;
+    if keys(($config->{rollbar}{error_match_header}//{})->%*);
 
 
 =head1 HELPERS