Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rust crate omicron-zone-package to 0.11.0 #1140

Merged
merged 3 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ base64 = "0.22.1"
bincode = "1.3"
byte-unit = "5.1.4"
bytes = { version = "1", features = ["serde"] }
camino = { version = "1.1", features = ["serde1"] }
cfg-if = { version = "1" }
chrono = { version = "0.4", features = [ "serde" ] }
clap = { version = "4.5", features = ["derive", "env", "wrap_help"] }
Expand All @@ -65,7 +66,7 @@ nix = { version = "0.28", features = [ "feature", "uio" ] }
num_enum = "0.7"
num-derive = "0.4"
num-traits = "0.2"
omicron-zone-package = "0.10.0"
omicron-zone-package = "0.11.0"
openapiv3 = "2.0.0"
opentelemetry = "0.22.0"
opentelemetry-jaeger = { version = "0.20.0" }
Expand Down
3 changes: 2 additions & 1 deletion package/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
anyhow.workspace = true
camino.workspace = true
crucible-workspace-hack.workspace = true
omicron-zone-package.workspace = true
tokio.workspace = true
crucible-workspace-hack.workspace = true
10 changes: 5 additions & 5 deletions package/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Copyright 2022 Oxide Computer Company

use anyhow::Result;
use camino::Utf8Path;
use omicron_zone_package::config;
use omicron_zone_package::target::Target;
use std::fs::create_dir_all;
use std::path::Path;

#[tokio::main]
async fn main() -> Result<()> {
let cfg = config::parse("package-manifest.toml")?;

let output_dir = Path::new("out");
let output_dir = Utf8Path::new("out");
create_dir_all(output_dir)?;

let packages = cfg.packages_to_deploy(&Target::default());
Expand All @@ -19,9 +19,9 @@ async fn main() -> Result<()> {
for batch in package_iter {
for (name, package) in &batch {
println!("Building '{name}'");
package
.create_for_target(&Target::default(), name, output_dir)
.await?;
let build_config =
omicron_zone_package::package::BuildConfig::default();
package.create(name, output_dir, &build_config).await?;
}
}

Expand Down
1 change: 1 addition & 0 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ publish = false

### BEGIN HAKARI SECTION
[dependencies]
arrayvec = { version = "0.7", default-features = false, features = ["std"] }
bitflags = { version = "2", default-features = false, features = ["serde", "std"] }
bytes = { version = "1", features = ["serde"] }
chrono = { version = "0.4", features = ["serde"] }
Expand Down