try a weird way of bringing external/internal into nexus

Author: david-crespo

omicron-nexus/src/db/datastore.rs

@@ -62,7 +62,7 @@ use super::sql_operations::sql_insert_unique;
 use super::sql_operations::sql_insert_unique_idempotent_and_fetch;
 use super::sql_operations::sql_update_precond;
 use crate::db;
-use crate::params;
+use crate::external::params;
 
 pub struct DataStore {
     pool: Arc<Pool>,

omicron-nexus/src/http_entrypoints_external.rs renamed to omicron-nexus/src/external/http_entrypoints.rs

@@ -2,11 +2,11 @@
  * Handler functions (entrypoints) for external HTTP APIs
  */
 
-use super::ServerContext;
+use crate::context::ServerContext;
 use crate::db;
 
-use crate::params;
-use crate::views;
+use super::params;
+use super::views;
 use dropshot::endpoint;
 use dropshot::ApiDescription;
 use dropshot::HttpError;

omicron-nexus/src/external/mod.rs

@@ -0,0 +1,3 @@
+pub mod http_entrypoints;
+pub mod params;
+mod views;

omicron-nexus/src/params.rs renamed to omicron-nexus/src/external/params.rs

@@ -1,7 +1,7 @@
 /**
  * Handler functions (entrypoints) for HTTP APIs internal to the control plane
  */
-use super::ServerContext;
+use super::super::ServerContext;
 
 use dropshot::endpoint;
 use dropshot::ApiDescription;

omicron-nexus/src/views.rs renamed to omicron-nexus/src/external/views.rs

@@ -0,0 +1 @@
+pub mod http_entrypoints;

omicron-nexus/src/http_entrypoints_internal.rs renamed to omicron-nexus/src/internal/http_entrypoints.rs

@@ -15,21 +15,19 @@
 mod config;
 mod context;
 pub mod db; // Public only for some documentation examples
-mod http_entrypoints_external;
-mod http_entrypoints_internal;
+pub mod external;
+mod internal;
 mod nexus;
-pub mod params;
 mod saga_interface;
 mod sagas;
-pub mod views;
 
 pub use config::Config;
 pub use context::ServerContext;
 pub use nexus::Nexus;
 pub use nexus::TestInterfaces;
 
-use http_entrypoints_external::external_api;
-use http_entrypoints_internal::internal_api;
+use external::http_entrypoints::external_api;
+use internal::http_entrypoints::internal_api;
 
 use slog::Logger;
 use std::sync::Arc;

omicron-nexus/src/internal/mod.rs

@@ -3,7 +3,7 @@
  */
 
 use crate::db;
-use crate::params;
+use crate::external::params;
 use crate::saga_interface::SagaContext;
 use crate::sagas;
 use anyhow::Context;

omicron-nexus/src/lib.rs

@@ -17,8 +17,8 @@ use omicron_common::api::external::IdentityMetadataCreateParams;
 use omicron_common::api::external::IdentityMetadataUpdateParams;
 use omicron_common::api::external::Name;
 use omicron_common::api::external::Sled;
-use omicron_nexus::params;
-use omicron_nexus::views::Project;
+use omicron_nexus::external::params;
+use omicron_nexus::external::views::Project;
 use std::convert::TryFrom;
 use uuid::Uuid;