also include Location header in these DELETE endpoints

joyent · Dec 3, 2020 · 6f0d9a6 · 6f0d9a6
1 parent edd92a6
commit 6f0d9a6
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/docs/modules/Conch::Route::Build.md b/docs/modules/Conch::Route::Build.md
@@ -61,7 +61,7 @@ Supports the following optional query parameters:
 
 - Requires system admin authorization or the admin role on the build
 - Request: [request.json#/$defs/BuildLinksOrNull](../json-schema/request.json#/$defs/BuildLinksOrNull)
-- Response: 204 NO CONTENT
+- Response: `204 No Content`, plus Location header
 
 ### `GET /build/:build_id_or_name/user`
 

diff --git a/docs/modules/Conch::Route::Rack.md b/docs/modules/Conch::Route::Rack.md
@@ -104,7 +104,7 @@ only the rack's phase, or all the rack's devices' phases as well.
 
 - User requires the read/write role on the rack
 - Request: [request.json#/$defs/RackLinksOrNull](../json-schema/request.json#/$defs/RackLinksOrNull)
-- Response: 204 NO CONTENT
+- Response: `204 No Content`, plus Location header
 
 ### `GET /rack/:rack_id_or_name/layout/:layout_id_or_rack_unit_start`
 

diff --git a/lib/Conch/Controller/Build.pm b/lib/Conch/Controller/Build.pm
@@ -280,7 +280,8 @@ sub remove_links ($c) {
       ->update({ links => '{}' });
   }
 
-  $c->status(204);
+  my $build_id = $c->stash('build_id') // $c->stash('build_rs')->get_column('id')->single;
+  $c->status(204, '/build/'.$build_id);
 }
 
 =head2 get_users

diff --git a/lib/Conch/Controller/Rack.pm b/lib/Conch/Controller/Rack.pm
@@ -604,7 +604,8 @@ sub remove_links ($c) {
       ->update({ links => '{}', updated => \'now()' });
   }
 
-  $c->status(204);
+  my $rack_id = $c->stash('rack_id') // $c->stash('rack_rs')->get_column('id')->single;
+  $c->status(204, '/rack/'.$rack_id);
 }
 
 1;

diff --git a/lib/Conch/Route/Build.pm b/lib/Conch/Route/Build.pm
@@ -221,7 +221,7 @@ Supports the following optional query parameters:
 
 =item * Request: F<request.yaml#/$defs/BuildLinksOrNull>
 
-=item * Response: 204 NO CONTENT
+=item * Response: C<204 No Content>, plus Location header
 
 =back
 

diff --git a/lib/Conch/Route/Rack.pm b/lib/Conch/Route/Rack.pm
@@ -267,7 +267,7 @@ only the rack's phase, or all the rack's devices' phases as well.
 
 =item * Request: F<request.yaml#/$defs/RackLinksOrNull>
 
-=item * Response: 204 NO CONTENT
+=item * Response: C<204 No Content>, plus Location header
 
 =back
 

diff --git a/t/integration/crud/build.t b/t/integration/crud/build.t
@@ -192,10 +192,12 @@ $t->get_ok('/build/my first build')
     ->json_is($build);
 
 $t->delete_ok('/build/my first build/links', json => { links => [ 'https://does-not-exist.com' ] })
-    ->status_is(204);
+    ->status_is(204)
+    ->location_is('/build/'.$build->{id});
 
 $t->delete_ok('/build/my first build/links', json => { links => ['https://alpha.com/1'] })
-    ->status_is(204);
+    ->status_is(204)
+    ->location_is('/build/'.$build->{id});
 $build->{links} = ['https://baz.com/3'];
 
 $t->get_ok('/build/my first build')
@@ -204,7 +206,8 @@ $t->get_ok('/build/my first build')
     ->json_is($build);
 
 $t->delete_ok('/build/my first build/links')
-    ->status_is(204);
+    ->status_is(204)
+    ->location_is('/build/'.$build->{id});
 $build->{links} = [];
 
 $t->get_ok('/build/my first build')

diff --git a/t/integration/crud/racks.t b/t/integration/crud/racks.t
@@ -510,10 +510,12 @@ subtest 'rack links' => sub {
     }));
 
   $t->delete_ok('/rack/'.$rack->id.'/links', json => { links => [ 'https://does-not-exist.com' ] })
-    ->status_is(204);
+    ->status_is(204)
+    ->location_is('/rack/'.$rack->id);
 
   $t->delete_ok('/rack/'.$rack->id.'/links', json => { links => ['https://alpha.com/1'] })
-    ->status_is(204);
+    ->status_is(204)
+    ->location_is('/rack/'.$rack->id);
 
   $t->get_ok('/rack/'.$rack->id)
     ->status_is(200)
@@ -524,7 +526,8 @@ subtest 'rack links' => sub {
     }));
 
   $t->delete_ok('/rack/'.$rack->id.'/links')
-    ->status_is(204);
+    ->status_is(204)
+    ->location_is('/rack/'.$rack->id);
   $rack->{links} = [];
 
   $t->get_ok('/rack/'.$rack->id)