rename spec.rs -> omicron.rs

Author: davepacheco

dev-tools/openapi-manager/README.adoc

@@ -92,8 +92,7 @@ If in doubt, look at an existing versioned API crate (e.g., `dns-server-api/src/
 **For both lockstep and versioned APIs:** once the API crate is defined, update the OpenAPI manager to manage the new OpenAPI document(s). Within this directory:
 
 . In `Cargo.toml`, add a dependency on the API crate.
-// XXX-dap-last-step this will need an update
-. In `src/spec.rs`, add the crate to the `all_apis` function. (Please keep the list sorted by filename.)  For versioned crates, you'll use the `supported_versions()` function defined by the `api_versions!` macro.  Again, use one of the existing examples as a guide.
+. In `src/omicron.rs`, add the crate to the `all_apis` function. (Please keep the list sorted by filename.)  For versioned crates, you'll use the `supported_versions()` function defined by the `api_versions!` macro.  Again, use one of the existing examples as a guide.
 
 To ensure everything works well, run `cargo xtask openapi generate`. Your
 OpenAPI document should be generated on disk and listed in the output.
@@ -264,8 +263,7 @@ An existing lockstep API can be made versioned.  You would do this when transiti
 . Run `git rm -f openapi/dns-server.json`.
 . Run `mkdir openapi/dns-server`.
 . Update the API crate (`dns-server-api/src/lib.rs`) to use the new `api_versions!` macro.  See the instructions under <<_adding_new_openapi_documents>> above.
-// XXX-dap-last-step
-. Update the OpenAPI manager configuration in `src/spec.rs` (in this directory) to specify that the API is now versioned.  You'll use the `supported_versions()` function defined by the `api_versions!` macro.
+. Update the OpenAPI manager configuration in `src/omicron.rs` (in this directory) to specify that the API is now versioned.  You'll use the `supported_versions()` function defined by the `api_versions!` macro.
 . Run `cargo xtask openapi generate`.  This will generate a new file under `openapi/dns-server` for your initial server version, along with a "latest" symlink.
 +
 You will probably see this warning:

dev-tools/openapi-manager/src/apis.rs

@@ -190,7 +190,7 @@ pub struct ManagedApis {
 impl ManagedApis {
     pub fn all() -> anyhow::Result<ManagedApis> {
         ManagedApis::new(
-            crate::spec::all_apis()
+            crate::omicron::all_apis()
                 .into_iter()
                 .map(ManagedApiConfig::from)
                 .map(ManagedApi::from)

dev-tools/openapi-manager/src/lib.rs

@@ -17,9 +17,9 @@ mod compatibility;
 mod environment;
 mod git;
 mod iter_only;
+mod omicron;
 mod output;
 mod resolved;
-mod spec;
 mod spec_files_blessed;
 mod spec_files_generated;
 mod spec_files_generic;

dev-tools/openapi-manager/src/spec.rs dev-tools/openapi-manager/src/omicron.rsdev-tools/openapi-manager/src/spec.rs renamed to dev-tools/openapi-manager/src/omicron.rs

@@ -2,13 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-// XXX-dap-last-step delete me
-
-use crate::apis::{ApiBoundary, Versions};
-use anyhow::Result;
-use dropshot::{ApiDescription, ApiDescriptionBuildErrors, StubContext};
-use openapi_manager_types::ValidationContext;
-use openapiv3::OpenAPI;
+use crate::apis::{ApiBoundary, ManagedApiConfig, Versions};
 
 /// All APIs managed by openapi-manager.
 // TODO The metadata here overlaps with metadata in api-manifest.toml.