-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[omicron-dev] split out components into their own binaries (#6209)
I've found myself wanting to run things like MGS via omicron-dev for a while, but that process requiring all of Nexus to be built has always made it a bit daunting. Split all the components out into their own binaries to ensure that the minimum set of dependencies gets built in each case. There are now separate binaries, all called `-dev` for consistency: * `cert-dev`: operate on certificates * `ch-dev`: ClickHouse * `db-dev`: CockroachDB * `mgs-dev`: MGS * `omicron-dev`: just Nexus There are some workflow changes here: * `omicron-dev cert-create` -> `cert-dev create` * `omicron-dev ch-run` -> `ch-dev run` * `omicron-dev db-run` -> `db-dev run` * `omicron-dev db-populate` -> `db-dev populate` * `omicron-dev db-wipe` -> `db-dev wipe` * `omicron-dev mgs-run` -> `mgs-dev run` There are also `xtask` aliases for these commands. But other than that this is just code movement -- there are no underlying changes. (I'll send out an email to all@ about this change.) An earlier iteration (#6170) attempted to use feature sets to manage this, but there were legitimate concerns raised there about how `target/debug/omicron-dev` would have different subcommands based on the last time you built it. I tried a few alternatives but ultimately like this one the most. In the future I'll also add a way to run wicketd via a `wicketd-dev` binary, and maybe one for sled-agent-sim as well.
- Loading branch information
1 parent
afe7040
commit eb9f9d5
Showing
36 changed files
with
1,683 additions
and
1,293 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
[package] | ||
name = "cert-dev" | ||
version = "0.1.0" | ||
edition = "2021" | ||
license = "MPL-2.0" | ||
|
||
[lints] | ||
workspace = true | ||
|
||
[dependencies] | ||
anyhow.workspace = true | ||
camino.workspace = true | ||
clap.workspace = true | ||
libc.workspace = true | ||
omicron-workspace-hack.workspace = true | ||
tokio.workspace = true | ||
rcgen.workspace = true | ||
|
||
[dev-dependencies] | ||
camino-tempfile.workspace = true | ||
omicron-test-utils.workspace = true | ||
openssl.workspace = true | ||
subprocess.workspace = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
// This Source Code Form is subject to the terms of the Mozilla Public | ||
// 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/. | ||
|
||
use std::{io::Write, os::unix::fs::OpenOptionsExt}; | ||
|
||
use anyhow::Context; | ||
use camino::{Utf8Path, Utf8PathBuf}; | ||
use clap::{Parser, Subcommand}; | ||
|
||
#[tokio::main] | ||
async fn main() -> anyhow::Result<()> { | ||
let args = CertDevApp::parse(); | ||
args.exec().await | ||
} | ||
|
||
/// Tools for working with certificates. | ||
#[derive(Parser)] | ||
struct CertDevApp { | ||
#[clap(subcommand)] | ||
command: CertDevCmd, | ||
} | ||
|
||
impl CertDevApp { | ||
async fn exec(self) -> anyhow::Result<()> { | ||
match self.command { | ||
CertDevCmd::Create(args) => args.exec().await, | ||
} | ||
} | ||
} | ||
|
||
#[derive(Subcommand)] | ||
enum CertDevCmd { | ||
/// Create a self-signed certificate for use with Omicron. | ||
Create(CertCreateArgs), | ||
} | ||
|
||
#[derive(Clone, Debug, Parser)] | ||
pub struct CertCreateArgs { | ||
/// path to where the generated certificate and key files should go | ||
/// (e.g., "out/initial-" would cause the files to be called | ||
/// "out/initial-cert.pem" and "out/initial-key.pem") | ||
#[clap(action)] | ||
output_base: Utf8PathBuf, | ||
|
||
/// DNS names that the certificate claims to be valid for (subject | ||
/// alternative names) | ||
#[clap(action, required = true)] | ||
server_names: Vec<String>, | ||
} | ||
|
||
impl CertCreateArgs { | ||
pub async fn exec(&self) -> Result<(), anyhow::Error> { | ||
let cert = | ||
rcgen::generate_simple_self_signed(self.server_names.clone()) | ||
.context("generating certificate")?; | ||
let cert_pem = | ||
cert.serialize_pem().context("serializing certificate as PEM")?; | ||
let key_pem = cert.serialize_private_key_pem(); | ||
|
||
let cert_path = | ||
Utf8PathBuf::from(format!("{}cert.pem", self.output_base)); | ||
write_private_file(&cert_path, cert_pem.as_bytes()) | ||
.context("writing certificate file")?; | ||
println!("wrote certificate to {}", cert_path); | ||
|
||
let key_path = | ||
Utf8PathBuf::from(format!("{}key.pem", self.output_base)); | ||
write_private_file(&key_path, key_pem.as_bytes()) | ||
.context("writing private key file")?; | ||
println!("wrote private key to {}", key_path); | ||
|
||
Ok(()) | ||
} | ||
} | ||
|
||
#[cfg_attr(not(target_os = "macos"), allow(clippy::useless_conversion))] | ||
fn write_private_file( | ||
path: &Utf8Path, | ||
contents: &[u8], | ||
) -> Result<(), anyhow::Error> { | ||
// The file should be readable and writable by the user only. | ||
let perms = libc::S_IRUSR | libc::S_IWUSR; | ||
let mut file = std::fs::OpenOptions::new() | ||
.write(true) | ||
.create_new(true) | ||
.mode(perms.into()) // into() needed on mac only | ||
.open(path) | ||
.with_context(|| format!("open {:?} for writing", path))?; | ||
file.write_all(contents).with_context(|| format!("write to {:?}", path)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
// This Source Code Form is subject to the terms of the Mozilla Public | ||
// 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/. | ||
|
||
//! Tests for cert-dev. | ||
use std::path::PathBuf; | ||
|
||
use anyhow::Context; | ||
use omicron_test_utils::dev::test_cmds::{ | ||
assert_exit_code, path_to_executable, run_command, EXIT_SUCCESS, | ||
}; | ||
use subprocess::Exec; | ||
|
||
const CMD_CERT_DEV: &str = env!("CARGO_BIN_EXE_cert-dev"); | ||
|
||
fn path_to_cert_dev() -> PathBuf { | ||
path_to_executable(CMD_CERT_DEV) | ||
} | ||
|
||
#[test] | ||
fn test_cert_create() { | ||
let tmpdir = camino_tempfile::tempdir().unwrap(); | ||
println!("tmpdir: {}", tmpdir.path()); | ||
let output_base = format!("{}/test-", tmpdir.path()); | ||
let exec = Exec::cmd(path_to_cert_dev()) | ||
.arg("create") | ||
.arg(output_base) | ||
.arg("foo.example") | ||
.arg("bar.example"); | ||
let (exit_status, _, stderr_text) = run_command(exec); | ||
assert_exit_code(exit_status, EXIT_SUCCESS, &stderr_text); | ||
let cert_path = tmpdir.path().join("test-cert.pem"); | ||
let key_path = tmpdir.path().join("test-key.pem"); | ||
let cert_contents = std::fs::read(&cert_path) | ||
.with_context(|| format!("reading certificate path {:?}", cert_path)) | ||
.unwrap(); | ||
let key_contents = std::fs::read(&key_path) | ||
.with_context(|| format!("reading private key path: {:?}", key_path)) | ||
.unwrap(); | ||
let certs_pem = openssl::x509::X509::stack_from_pem(&cert_contents) | ||
.context("parsing certificate") | ||
.unwrap(); | ||
let private_key = openssl::pkey::PKey::private_key_from_pem(&key_contents) | ||
.context("parsing private key") | ||
.unwrap(); | ||
assert!(certs_pem | ||
.iter() | ||
.last() | ||
.unwrap() | ||
.public_key() | ||
.unwrap() | ||
.public_eq(&private_key)); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
[package] | ||
name = "ch-dev" | ||
version = "0.1.0" | ||
edition = "2021" | ||
license = "MPL-2.0" | ||
|
||
[lints] | ||
workspace = true | ||
|
||
[build-dependencies] | ||
omicron-rpaths.workspace = true | ||
|
||
[dependencies] | ||
anyhow.workspace = true | ||
clap.workspace = true | ||
dropshot.workspace = true | ||
futures.workspace = true | ||
libc.workspace = true | ||
omicron-test-utils.workspace = true | ||
omicron-workspace-hack.workspace = true | ||
# See omicron-rpaths for more about the "pq-sys" dependency. | ||
pq-sys = "*" | ||
signal-hook-tokio.workspace = true | ||
tokio.workspace = true |
Oops, something went wrong.