Skip to content

Add #[serde(flatten)] to identity on some views that were missing it #581

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 10, 2022
Merged

Add #[serde(flatten)] to identity on some views that were missing it #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions common/src/api/external/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,7 @@ pub enum VpcRouterKind {
#[derive(ObjectIdentity, Clone, Debug, Deserialize, Serialize, JsonSchema)]
pub struct VpcRouter {
/// common identifying metadata
#[serde(flatten)]
pub identity: IdentityMetadata,

pub kind: VpcRouterKind,
Expand Down Expand Up @@ -1364,6 +1365,7 @@ pub enum RouterRouteKind {
#[derive(ObjectIdentity, Clone, Debug, Deserialize, Serialize, JsonSchema)]
pub struct RouterRoute {
/// common identifying metadata
#[serde(flatten)]
pub identity: IdentityMetadata,

/// The VPC Router to which the route belongs.
Expand Down Expand Up @@ -1400,6 +1402,7 @@ pub struct RouterRouteUpdateParams {
#[derive(ObjectIdentity, Clone, Debug, Deserialize, Serialize, JsonSchema)]
pub struct VpcFirewallRule {
/// common identifying metadata
#[serde(flatten)]
pub identity: IdentityMetadata,
/// whether this rule is in effect
pub status: VpcFirewallRuleStatus,
Expand Down
2 changes: 2 additions & 0 deletions nexus/src/external_api/views.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ impl Into<Vpc> for model::Vpc {
#[derive(ObjectIdentity, Clone, Debug, Deserialize, Serialize, JsonSchema)]
pub struct VpcSubnet {
/** common identifying metadata */
#[serde(flatten)]
pub identity: IdentityMetadata,

/** The VPC to which the subnet belongs. */
Expand Down Expand Up @@ -146,6 +147,7 @@ impl Into<VpcSubnet> for model::VpcSubnet {
#[derive(ObjectIdentity, Clone, Debug, Deserialize, Serialize, JsonSchema)]
#[serde(rename_all = "camelCase")]
pub struct Rack {
#[serde(flatten)]
pub identity: IdentityMetadata,
}

Expand Down
180 changes: 150 additions & 30 deletions openapi/nexus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3815,12 +3815,40 @@
"description": "Client view of an [`Rack`]",
"type": "object",
"properties": {
"identity": {
"$ref": "#/components/schemas/IdentityMetadata"
"description": {
"description": "human-readable free-form text about a resource",
"type": "string"
},
"id": {
"description": "unique, immutable, system-controlled identifier for each resource",
"type": "string",
"format": "uuid"
},
"name": {
"description": "unique, mutable, user-controlled identifier for each resource",
"allOf": [
{
"$ref": "#/components/schemas/Name"
}
]
},
"timeCreated": {
"description": "timestamp when this resource was created",
"type": "string",
"format": "date-time"
},
"timeModified": {
"description": "timestamp when this resource was last modified",
"type": "string",
"format": "date-time"
}
},
"required": [
"identity"
"description",
"id",
"name",
"timeCreated",
"timeModified"
]
},
"RackResultsPage": {
Expand Down Expand Up @@ -4048,22 +4076,31 @@
"description": "A route defines a rule that governs where traffic should be sent based on its destination.",
"type": "object",
"properties": {
"description": {
"description": "human-readable free-form text about a resource",
"type": "string"
},
"destination": {
"$ref": "#/components/schemas/RouteDestination"
},
"identity": {
"description": "common identifying metadata",
"id": {
"description": "unique, immutable, system-controlled identifier for each resource",
"type": "string",
"format": "uuid"
},
"kind": {
"description": "Describes the kind of router. Set at creation. `read-only`",
"allOf": [
{
"$ref": "#/components/schemas/IdentityMetadata"
"$ref": "#/components/schemas/RouterRouteKind"
}
]
},
"kind": {
"description": "Describes the kind of router. Set at creation. `read-only`",
"name": {
"description": "unique, mutable, user-controlled identifier for each resource",
"allOf": [
{
"$ref": "#/components/schemas/RouterRouteKind"
"$ref": "#/components/schemas/Name"
}
]
},
Expand All @@ -4074,14 +4111,28 @@
},
"target": {
"$ref": "#/components/schemas/RouteTarget"
},
"timeCreated": {
"description": "timestamp when this resource was created",
"type": "string",
"format": "date-time"
},
"timeModified": {
"description": "timestamp when this resource was last modified",
"type": "string",
"format": "date-time"
}
},
"required": [
"description",
"destination",
"identity",
"id",
"kind",
"name",
"router_id",
"target"
"target",
"timeCreated",
"timeModified"
]
},
"RouterRouteCreateParams": {
Expand Down Expand Up @@ -4633,6 +4684,10 @@
}
]
},
"description": {
"description": "human-readable free-form text about a resource",
"type": "string"
},
"direction": {
"description": "whether this rule is for incoming or outgoing traffic",
"allOf": [
Expand All @@ -4649,11 +4704,16 @@
}
]
},
"identity": {
"description": "common identifying metadata",
"id": {
"description": "unique, immutable, system-controlled identifier for each resource",
"type": "string",
"format": "uuid"
},
"name": {
"description": "unique, mutable, user-controlled identifier for each resource",
"allOf": [
{
"$ref": "#/components/schemas/IdentityMetadata"
"$ref": "#/components/schemas/Name"
}
]
},
Expand All @@ -4677,16 +4737,30 @@
"items": {
"$ref": "#/components/schemas/VpcFirewallRuleTarget"
}
},
"timeCreated": {
"description": "timestamp when this resource was created",
"type": "string",
"format": "date-time"
},
"timeModified": {
"description": "timestamp when this resource was last modified",
"type": "string",
"format": "date-time"
}
},
"required": [
"action",
"description",
"direction",
"filters",
"identity",
"id",
"name",
"priority",
"status",
"targets"
"targets",
"timeCreated",
"timeModified"
]
},
"VpcFirewallRuleAction": {
Expand Down Expand Up @@ -5028,16 +5102,35 @@
"description": "A VPC router defines a series of rules that indicate where traffic should be sent depending on its destination.",
"type": "object",
"properties": {
"identity": {
"description": "common identifying metadata",
"description": {
"description": "human-readable free-form text about a resource",
"type": "string"
},
"id": {
"description": "unique, immutable, system-controlled identifier for each resource",
"type": "string",
"format": "uuid"
},
"kind": {
"$ref": "#/components/schemas/VpcRouterKind"
},
"name": {
"description": "unique, mutable, user-controlled identifier for each resource",
"allOf": [
{
"$ref": "#/components/schemas/IdentityMetadata"
"$ref": "#/components/schemas/Name"
}
]
},
"kind": {
"$ref": "#/components/schemas/VpcRouterKind"
"timeCreated": {
"description": "timestamp when this resource was created",
"type": "string",
"format": "date-time"
},
"timeModified": {
"description": "timestamp when this resource was last modified",
"type": "string",
"format": "date-time"
},
"vpc_id": {
"description": "The VPC to which the router belongs.",
Expand All @@ -5046,8 +5139,12 @@
}
},
"required": [
"identity",
"description",
"id",
"kind",
"name",
"timeCreated",
"timeModified",
"vpc_id"
]
},
Expand Down Expand Up @@ -5117,13 +5214,14 @@
"description": "A VPC subnet represents a logical grouping for instances that allows network traffic between them, within a IPv4 subnetwork or optionall an IPv6 subnetwork.",
"type": "object",
"properties": {
"identity": {
"description": "common identifying metadata",
"allOf": [
{
"$ref": "#/components/schemas/IdentityMetadata"
}
]
"description": {
"description": "human-readable free-form text about a resource",
"type": "string"
},
"id": {
"description": "unique, immutable, system-controlled identifier for each resource",
"type": "string",
"format": "uuid"
},
"ipv4_block": {
"nullable": true,
Expand All @@ -5143,14 +5241,36 @@
}
]
},
"name": {
"description": "unique, mutable, user-controlled identifier for each resource",
"allOf": [
{
"$ref": "#/components/schemas/Name"
}
]
},
"timeCreated": {
"description": "timestamp when this resource was created",
"type": "string",
"format": "date-time"
},
"timeModified": {
"description": "timestamp when this resource was last modified",
"type": "string",
"format": "date-time"
},
"vpc_id": {
"description": "The VPC to which the subnet belongs.",
"type": "string",
"format": "uuid"
}
},
"required": [
"identity",
"description",
"id",
"name",
"timeCreated",
"timeModified",
"vpc_id"
]
},
Expand Down