Merge pull request #873 from joyent/ether/v2-relay-delete

add DELETE /relay/:serial

docs/modules/Conch::Controller::Relay.md

@@ -15,6 +15,8 @@ If the user is a system admin, retrieve a list of all active relays in the datab
 
 Response uses the Relays json schema.
 
+## delete
+
 # LICENSING
 
 Copyright Joyent, Inc.

docs/modules/Conch::Route::Relay.md

@@ -20,6 +20,11 @@ Unless otherwise noted, all routes require authentication.
 - Requires System Admin Authentication
 - Response: response.yaml#/Relays
 
+## `DELETE /relay/:relay_serial_number`
+
+- Requires system admin authorization
+- Response: `204 NO CONTENT`
+
 # LICENSING
 
 Copyright Joyent, Inc.

lib/Conch/Controller/Relay.pm

@@ -53,6 +53,28 @@ sub list ($c) {
     $c->status(200, [ $c->db_relays->active->all ]);
 }
 
+=head2 delete
+
+=cut
+
+sub delete ($c) {
+    my $identifier = $c->stash('relay_serial_number');
+
+    my $rs = $c->db_relays
+        ->active
+        ->search({ id => $identifier });
+    return $c->status(404) if not $rs->exists;
+
+    my $drc_count = $rs->related_resultset('device_relay_connections')->delete;
+    my $urc_count = $rs->related_resultset('user_relay_connections')->delete;
+    $rs->deactivate;
+
+    $c->log->debug('Deactivated relay '.$identifier
+        .', removing '.$drc_count.' associated device connections and '
+        .$urc_count.' associated user connections');
+    return $c->status(204);
+}
+
 1;
 __END__
 

lib/Conch/Route/Relay.pm

@@ -27,6 +27,9 @@ sub routes {
 
     # GET /relay
     $relay->get('/')->to('#list');
+
+    # DELETE /relay/:relay_serial_number
+    $relay->require_system_admin->delete('/:relay_serial_number')->to('#delete');
 }
 
 1;
@@ -60,6 +63,16 @@ Unless otherwise noted, all routes require authentication.
 
 =cut
 
+=head2 C<DELETE /relay/:relay_serial_number>
+
+=over 4
+
+=item * Requires system admin authorization
+
+=item * Response: C<204 NO CONTENT>
+
+=back
+
 =head1 LICENSING
 
 Copyright Joyent, Inc.

t/integration/crud/relay.t

@@ -259,5 +259,24 @@ subtest get_relay_devices => sub {
         ]);
 };
 
+subtest delete => sub {
+    $t->authenticate(user => $t->load_fixture('null_user')->email);
+
+    $t->delete_ok('/relay/'.$relay0->id)
+        ->status_is(403);
+
+    $t->authenticate;   # back to superuser
+
+    $t->delete_ok('/relay/'.$relay0->id)
+        ->status_is(204)
+        ->log_debug_is('Deactivated relay '.$relay0->id.', removing 2 associated device connections and 1 associated user connections');
+
+    $t->get_ok('/relay/'.$relay0->id)
+        ->status_is(404);
+
+    $t->delete_ok('/relay/'.$relay0->id)
+        ->status_is(404);
+};
+
 done_testing;
 # vim: set ts=4 sts=4 sw=4 et :