ryan
/
progenitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump typify from `da0505b` to `5106273` (#291) 

* Bump typify from `da0505b` to `5106273`

Bumps [typify](https://github.com/oxidecomputer/typify) from `da0505b` to `5106273`.
- [Release notes](https://github.com/oxidecomputer/typify/releases)
- [Commits](da0505b0b4...5106273f3d)

---
updated-dependencies:
- dependency-name: typify
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* update output

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam H. Leventhal <ahl@oxide.computer>
This commit is contained in:
dependabot[bot] 2023-01-02 19:42:54 -08:00 committed by GitHub
parent 7c185e611d
commit de6895a040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 216 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -1920,7 +1920,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
[[package]] [[package]]
name = "typify" name = "typify"
version = "0.0.11-dev" version = "0.0.11-dev"
source = "git+https://github.com/oxidecomputer/typify#da0505b0b43180ee85d8df2a7c2504acb7ce01e0" source = "git+https://github.com/oxidecomputer/typify#5106273f3d424386250362f27e4774524b06550a"
dependencies = [ dependencies = [
"typify-impl", "typify-impl",
"typify-macro", "typify-macro",
@ -1929,7 +1929,7 @@ dependencies = [
[[package]] [[package]]
name = "typify-impl" name = "typify-impl"
version = "0.0.11-dev" version = "0.0.11-dev"
source = "git+https://github.com/oxidecomputer/typify#da0505b0b43180ee85d8df2a7c2504acb7ce01e0" source = "git+https://github.com/oxidecomputer/typify#5106273f3d424386250362f27e4774524b06550a"
dependencies = [ dependencies = [
"heck", "heck",
"log", "log",
@ -1947,7 +1947,7 @@ dependencies = [
[[package]] [[package]]
name = "typify-macro" name = "typify-macro"
version = "0.0.11-dev" version = "0.0.11-dev"
source = "git+https://github.com/oxidecomputer/typify#da0505b0b43180ee85d8df2a7c2504acb7ce01e0" source = "git+https://github.com/oxidecomputer/typify#5106273f3d424386250362f27e4774524b06550a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

38
progenitor-impl/tests/output/buildomat-builder.out
View File

@ -5,7 +5,7 @@ pub mod types {
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[allow(unused_imports)] #[allow(unused_imports)]
use std::convert::TryFrom; use std::convert::TryFrom;
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct Task { pub struct Task {
pub id: String, pub id: String,
pub name: String, pub name: String,
@ -20,7 +20,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct TaskEvent { pub struct TaskEvent {
pub payload: String, pub payload: String,
pub seq: u32, pub seq: u32,
@ -34,7 +34,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct TaskOutput { pub struct TaskOutput {
pub id: String, pub id: String,
pub path: String, pub path: String,
@ -47,7 +47,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct TaskSubmit { pub struct TaskSubmit {
pub name: String, pub name: String,
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
@ -61,7 +61,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct TaskSubmitResult { pub struct TaskSubmitResult {
pub id: String, pub id: String,
} }
@ -72,7 +72,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct UploadedChunk { pub struct UploadedChunk {
pub id: String, pub id: String,
} }
@ -83,7 +83,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct UserCreate { pub struct UserCreate {
pub name: String, pub name: String,
} }
@ -94,7 +94,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct UserCreateResult { pub struct UserCreateResult {
pub id: String, pub id: String,
pub name: String, pub name: String,
@ -107,7 +107,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WhoamiResult { pub struct WhoamiResult {
pub id: String, pub id: String,
pub name: String, pub name: String,
@ -119,7 +119,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct Worker { pub struct Worker {
pub deleted: bool, pub deleted: bool,
pub id: String, pub id: String,
@ -137,7 +137,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerAddOutput { pub struct WorkerAddOutput {
pub chunks: Vec<String>, pub chunks: Vec<String>,
pub path: String, pub path: String,
@ -150,7 +150,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerAppendTask { pub struct WorkerAppendTask {
pub payload: String, pub payload: String,
pub stream: String, pub stream: String,
@ -163,7 +163,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerBootstrap { pub struct WorkerBootstrap {
pub bootstrap: String, pub bootstrap: String,
pub token: String, pub token: String,
@ -175,7 +175,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerBootstrapResult { pub struct WorkerBootstrapResult {
pub id: String, pub id: String,
} }
@ -186,7 +186,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerCompleteTask { pub struct WorkerCompleteTask {
pub failed: bool, pub failed: bool,
} }
@ -197,7 +197,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerPingResult { pub struct WorkerPingResult {
pub poweroff: bool, pub poweroff: bool,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
@ -210,7 +210,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerPingTask { pub struct WorkerPingTask {
pub id: String, pub id: String,
pub output_rules: Vec<String>, pub output_rules: Vec<String>,
@ -223,7 +223,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkerTask { pub struct WorkerTask {
pub id: String, pub id: String,
pub name: String, pub name: String,
@ -236,7 +236,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct WorkersResult { pub struct WorkersResult {
pub workers: Vec<Worker>, pub workers: Vec<Worker>,
} }

20
progenitor-impl/tests/output/keeper-builder.out
View File

@ -5,7 +5,7 @@ pub mod types {
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[allow(unused_imports)] #[allow(unused_imports)]
use std::convert::TryFrom; use std::convert::TryFrom;
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct EnrolBody { pub struct EnrolBody {
pub host: String, pub host: String,
pub key: String, pub key: String,
@ -17,7 +17,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct GlobalJobsResult { pub struct GlobalJobsResult {
pub summary: Vec<ReportSummary>, pub summary: Vec<ReportSummary>,
} }
@ -28,7 +28,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct OutputRecord { pub struct OutputRecord {
pub msg: String, pub msg: String,
pub stream: String, pub stream: String,
@ -41,7 +41,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct PingResult { pub struct PingResult {
pub host: String, pub host: String,
pub ok: bool, pub ok: bool,
@ -53,7 +53,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct ReportFinishBody { pub struct ReportFinishBody {
pub duration_millis: usize, pub duration_millis: usize,
pub end_time: chrono::DateTime<chrono::offset::Utc>, pub end_time: chrono::DateTime<chrono::offset::Utc>,
@ -67,7 +67,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct ReportId { pub struct ReportId {
pub host: String, pub host: String,
pub job: String, pub job: String,
@ -82,7 +82,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct ReportOutputBody { pub struct ReportOutputBody {
pub id: ReportId, pub id: ReportId,
pub record: OutputRecord, pub record: OutputRecord,
@ -94,7 +94,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct ReportResult { pub struct ReportResult {
pub existed_already: bool, pub existed_already: bool,
} }
@ -105,7 +105,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct ReportStartBody { pub struct ReportStartBody {
pub id: ReportId, pub id: ReportId,
pub script: String, pub script: String,
@ -118,7 +118,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct ReportSummary { pub struct ReportSummary {
pub age_seconds: usize, pub age_seconds: usize,
pub duration_seconds: usize, pub duration_seconds: usize,

320
progenitor-impl/tests/output/nexus-builder.out
View File

File diff suppressed because it is too large Load Diff

48
progenitor-impl/tests/output/propolis-server-builder.out
View File

@ -5,7 +5,7 @@ pub mod types {
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[allow(unused_imports)] #[allow(unused_imports)]
use std::convert::TryFrom; use std::convert::TryFrom;
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct CrucibleOpts { pub struct CrucibleOpts {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub cert_pem: Option<String>, pub cert_pem: Option<String>,
@ -31,7 +31,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct DiskAttachment { pub struct DiskAttachment {
pub disk_id: uuid::Uuid, pub disk_id: uuid::Uuid,
pub generation_id: u64, pub generation_id: u64,
@ -44,7 +44,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub enum DiskAttachmentState { pub enum DiskAttachmentState {
Detached, Detached,
Destroyed, Destroyed,
@ -52,7 +52,7 @@ pub mod types {
Attached(uuid::Uuid), Attached(uuid::Uuid),
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct DiskRequest { pub struct DiskRequest {
pub device: String, pub device: String,
pub gen: u64, pub gen: u64,
@ -69,7 +69,7 @@ pub mod types {
} }
///Error information from a response. ///Error information from a response.
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct Error { pub struct Error {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub error_code: Option<String>, pub error_code: Option<String>,
@ -83,7 +83,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct Instance { pub struct Instance {
pub disks: Vec<DiskAttachment>, pub disks: Vec<DiskAttachment>,
pub nics: Vec<NetworkInterface>, pub nics: Vec<NetworkInterface>,
@ -97,7 +97,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceEnsureRequest { pub struct InstanceEnsureRequest {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub cloud_init_bytes: Option<String>, pub cloud_init_bytes: Option<String>,
@ -116,7 +116,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceEnsureResponse { pub struct InstanceEnsureResponse {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub migrate: Option<InstanceMigrateInitiateResponse>, pub migrate: Option<InstanceMigrateInitiateResponse>,
@ -128,7 +128,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceGetResponse { pub struct InstanceGetResponse {
pub instance: Instance, pub instance: Instance,
} }
@ -139,7 +139,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceMigrateInitiateRequest { pub struct InstanceMigrateInitiateRequest {
pub migration_id: uuid::Uuid, pub migration_id: uuid::Uuid,
pub src_addr: String, pub src_addr: String,
@ -152,7 +152,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceMigrateInitiateResponse { pub struct InstanceMigrateInitiateResponse {
pub migration_id: uuid::Uuid, pub migration_id: uuid::Uuid,
} }
@ -163,7 +163,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceMigrateStatusRequest { pub struct InstanceMigrateStatusRequest {
pub migration_id: uuid::Uuid, pub migration_id: uuid::Uuid,
} }
@ -174,7 +174,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceMigrateStatusResponse { pub struct InstanceMigrateStatusResponse {
pub state: MigrationState, pub state: MigrationState,
} }
@ -185,7 +185,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceProperties { pub struct InstanceProperties {
///ID of the bootrom used to initialize this Instance. ///ID of the bootrom used to initialize this Instance.
pub bootrom_id: uuid::Uuid, pub bootrom_id: uuid::Uuid,
@ -211,7 +211,7 @@ pub mod types {
///Current state of an Instance. ///Current state of an Instance.
#[derive( #[derive(
Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize, JsonSchema, Clone, Copy, Debug, Deserialize, Eq, Hash, JsonSchema, Ord, PartialEq, PartialOrd, Serialize,
)] )]
pub enum InstanceState { pub enum InstanceState {
Creating, Creating,
@ -262,7 +262,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceStateMonitorRequest { pub struct InstanceStateMonitorRequest {
pub gen: u64, pub gen: u64,
} }
@ -273,7 +273,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct InstanceStateMonitorResponse { pub struct InstanceStateMonitorResponse {
pub gen: u64, pub gen: u64,
pub state: InstanceState, pub state: InstanceState,
@ -286,7 +286,7 @@ pub mod types {
} }
#[derive( #[derive(
Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize, JsonSchema, Clone, Copy, Debug, Deserialize, Eq, Hash, JsonSchema, Ord, PartialEq, PartialOrd, Serialize,
)] )]
pub enum InstanceStateRequested { pub enum InstanceStateRequested {
Run, Run,
@ -320,7 +320,7 @@ pub mod types {
} }
#[derive( #[derive(
Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize, JsonSchema, Clone, Copy, Debug, Deserialize, Eq, Hash, JsonSchema, Ord, PartialEq, PartialOrd, Serialize,
)] )]
pub enum MigrationState { pub enum MigrationState {
Sync, Sync,
@ -371,7 +371,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct NetworkInterface { pub struct NetworkInterface {
pub attachment: NetworkInterfaceAttachmentState, pub attachment: NetworkInterfaceAttachmentState,
pub name: String, pub name: String,
@ -383,14 +383,14 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub enum NetworkInterfaceAttachmentState { pub enum NetworkInterfaceAttachmentState {
Detached, Detached,
Faulted, Faulted,
Attached(Slot), Attached(Slot),
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct NetworkInterfaceRequest { pub struct NetworkInterfaceRequest {
pub name: String, pub name: String,
pub slot: Slot, pub slot: Slot,
@ -404,7 +404,7 @@ pub mod types {
///A stable index which is translated by Propolis into a PCI BDF, visible ///A stable index which is translated by Propolis into a PCI BDF, visible
/// to the guest. /// to the guest.
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
pub struct Slot(pub u8); pub struct Slot(pub u8);
impl std::ops::Deref for Slot { impl std::ops::Deref for Slot {
type Target = u8; type Target = u8;
@ -413,7 +413,7 @@ pub mod types {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
pub enum VolumeConstructionRequest { pub enum VolumeConstructionRequest {
#[serde(rename = "volume")] #[serde(rename = "volume")]