Skip to content
This repository has been archived by the owner on Jul 24, 2021. It is now read-only.

Commit

Permalink
remove deprecated /validation endpoints
Browse files Browse the repository at this point in the history
- GET /validation
- GET /validation/:id
  • Loading branch information
karenetheridge committed Nov 16, 2020
1 parent 9fe51e7 commit f4df985
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 262 deletions.
3 changes: 0 additions & 3 deletions docs/index.md
Expand Up @@ -99,9 +99,6 @@ Available top-level routes are:
* [Conch::Route::User](modules/Conch::Route::User)
* `/user`

* [Conch::Route::Validation](modules/Conch::Route::Validation)
* `/validation`

* [Conch::Route::ValidationPlan](modules/Conch::Route::ValidationPlan)
* `/validation_plan`

Expand Down
35 changes: 0 additions & 35 deletions docs/modules/Conch::Controller::Validation.md

This file was deleted.

4 changes: 0 additions & 4 deletions docs/modules/Conch::Route.md
Expand Up @@ -124,10 +124,6 @@ See ["unsecured\_routes" in Conch::Route::JSONSchema](../modules/Conch%3A%3ARout

See ["routes" in Conch::Route::User](../modules/Conch%3A%3ARoute%3A%3AUser#routes)

### `* /validation`

See ["routes" in Conch::Route::Validation](../modules/Conch%3A%3ARoute%3A%3AValidation#routes)

### `* /validation_plan`

See ["routes" in Conch::Route::ValidationPlan](../modules/Conch%3A%3ARoute%3A%3AValidationPlan#routes)
Expand Down
35 changes: 0 additions & 35 deletions docs/modules/Conch::Route::Validation.md

This file was deleted.

2 changes: 0 additions & 2 deletions docs/modules/index.md
Expand Up @@ -35,7 +35,6 @@
* [Conch::Controller::RackRole](../modules/Conch::Controller::RackRole)
* [Conch::Controller::Relay](../modules/Conch::Controller::Relay)
* [Conch::Controller::User](../modules/Conch::Controller::User)
* [Conch::Controller::Validation](../modules/Conch::Controller::Validation)
* [Conch::Controller::ValidationPlan](../modules/Conch::Controller::ValidationPlan)
* [Conch::Controller::ValidationState](../modules/Conch::Controller::ValidationState)
* [Conch::Controller::Workspace](../modules/Conch::Controller::Workspace)
Expand Down Expand Up @@ -126,7 +125,6 @@
* [Conch::Route::RackRole](../modules/Conch::Route::RackRole)
* [Conch::Route::Relay](../modules/Conch::Route::Relay)
* [Conch::Route::User](../modules/Conch::Route::User)
* [Conch::Route::Validation](../modules/Conch::Route::Validation)
* [Conch::Route::ValidationPlan](../modules/Conch::Route::ValidationPlan)
* [Conch::Route::ValidationState](../modules/Conch::Route::ValidationState)
* [Conch::Route::Workspace](../modules/Conch::Route::Workspace)
Expand Down
82 changes: 0 additions & 82 deletions lib/Conch/Controller/Validation.pm

This file was deleted.

9 changes: 2 additions & 7 deletions lib/Conch/Route.pm
Expand Up @@ -13,7 +13,6 @@ use Conch::Route::DeviceReport;
use Conch::Route::Relay;
use Conch::Route::User;
use Conch::Route::HardwareProduct;
use Conch::Route::Validation;
use Conch::Route::Datacenter;
use Conch::Route::DatacenterRoom;
use Conch::Route::RackRole;
Expand Down Expand Up @@ -150,7 +149,6 @@ Returns the root node.
Conch::Route::Relay->routes($secured->any('/relay'));
Conch::Route::User->routes($secured->any('/user'));
Conch::Route::HardwareProduct->routes($secured->any('/hardware_product'));
Conch::Route::Validation->routes($secured->any('/validation'));
Conch::Route::Datacenter->routes($secured->any('/dc'));
Conch::Route::DatacenterRoom->routes($secured->any('/room'));
Conch::Route::RackRole->routes($secured->any('/rack_role'));
Expand All @@ -172,7 +170,8 @@ Returns the root node.
return map __SUB__->($_), $route->children->@*;
}

my @top_level_paths = uniqstr map find_paths($_), $root->children->@*;
my @top_level_paths = (uniqstr (map find_paths($_), $root->children->@*),
qw(validation));

$root->any('/*all', sub ($c) {
$c->log->warn('no endpoint found for: '.$c->req->method.' '.$c->req->url->path);
Expand Down Expand Up @@ -330,10 +329,6 @@ See L<Conch::Route::JSONSchema/unsecured_routes>
See L<Conch::Route::User/routes>
=head2 C<* /validation>
See L<Conch::Route::Validation/routes>
=head2 C<* /validation_plan>
See L<Conch::Route::ValidationPlan/routes>
Expand Down
76 changes: 0 additions & 76 deletions lib/Conch/Route/Validation.pm

This file was deleted.

17 changes: 1 addition & 16 deletions t/integration/crud/validations.t
Expand Up @@ -17,12 +17,7 @@ $t->load_validation_plans([{

$t->authenticate;

$t->get_ok('/validation')
->status_is(200)
->json_schema_is('LegacyValidations');

my $validation_id = $t->tx->res->json->[0]->{id};
my @validations = $t->tx->res->json->@*;
my @validations = map $_->TO_JSON, $t->app->db_validations->order_by([ 'validation.name', 'validation.version' ]);

$t->get_ok('/validation_plan')
->status_is(200)
Expand Down Expand Up @@ -59,15 +54,5 @@ $t->get_ok('/validation_plan/Conch v1 Legacy Plan: Server/validation')
->json_schema_is('LegacyValidations')
->json_is([ $validations[0] ]);

$t->get_ok('/validation/'.$validation_id)
->status_is(200)
->json_schema_is('LegacyValidation')
->json_is($validations[0]);

$t->get_ok('/validation/'.$validations[0]->{name})
->status_is(200)
->json_schema_is('LegacyValidation')
->json_is($validations[0]);

done_testing;
# vim: set ts=4 sts=4 sw=4 et :
7 changes: 5 additions & 2 deletions t/integration/removed-endpoints.t
Expand Up @@ -11,10 +11,13 @@ $t->get_ok('/foo')
->status_is(404)
->json_is({ error => 'Route Not Found' });

$t->get_ok('/rack')
$t->get_ok($_)
->status_is(404)
->stash_cmp_deeply('/top_level_path_match', 1)
->json_is({ error => 'Route Not Found' });
->json_is({ error => 'Route Not Found' })
foreach
'/rack',
'/validation';

done_testing;
# vim: set ts=4 sts=4 sw=4 et :

0 comments on commit f4df985

Please sign in to comment.