diff --git a/CHANGELOG.md b/CHANGELOG.md index 2150d2f..28192e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### Changed +- [#88](https://github.com/saas-rs/cli/issues/88) Retire management of SSH Keys - [#86](https://github.com/saas-rs/cli/issues/86) Upgrade 3 crates ## [0.3.7] - 2025-10-03 diff --git a/src/cmd/get/mod.rs b/src/cmd/get/mod.rs index 68b63d5..3ebe31b 100644 --- a/src/cmd/get/mod.rs +++ b/src/cmd/get/mod.rs @@ -11,7 +11,6 @@ pub(super) mod plan; pub(super) mod project; pub(super) mod service; pub(super) mod service_instance; -pub(super) mod ssh_key; pub use output::output; @@ -53,9 +52,6 @@ pub enum Subcommand { #[command(name = "service-instance", alias = "serviceInstance")] ServiceInstance(service_instance::Opts), - - #[command(name = "ssh-key", alias = "sshKey")] - SshKey(ssh_key::Opts), } pub async fn run(subcommand: Subcommand) -> Result<(), Box> { @@ -90,9 +86,6 @@ pub async fn run(subcommand: Subcommand) -> Result<(), Box { service_instance::run(id, output).await?; } - Subcommand::SshKey(ssh_key::Opts { id, output }) => { - ssh_key::run(id, output).await?; - } } Ok(()) } diff --git a/src/cmd/get/ssh_key.rs b/src/cmd/get/ssh_key.rs deleted file mode 100644 index 6719bf7..0000000 --- a/src/cmd/get/ssh_key.rs +++ /dev/null @@ -1,46 +0,0 @@ -use crate::apiclient; -use crate::cmd::list::projects; -use crate::protocol::saas_rs::user::v1::FindProjectRequest; -use clap::Parser; -use polars::prelude::*; -use std::io::Cursor; - -#[derive(Debug, Parser)] -pub struct Opts { - /// Project ID - #[arg(value_name = "ID")] - pub(super) id: String, - - /// Output format - #[arg(short = 'o', long = "output", default_value = "ps", value_parser = clap::builder::PossibleValuesParser::new(crate::OUTPUTS) - )] - pub(super) output: String, -} - -pub async fn run(id: String, output: String) -> Result<(), Box> { - // Request record - let mut client = apiclient::new_user_service_client().await?; - let req = FindProjectRequest { id }; - let res = client.find_project(req).await?.into_inner(); - - // Convert to dataframe in preparation for output - let json = serde_json::to_vec(&res.project)?; - let file = Cursor::new(json); - let df = JsonReader::new(file).finish()?; - - // Apply type-specific narrow formatting - let mut df = match output.as_str() { - "ps" => { - let cols: Vec<_> = projects::PS_COLUMNS - .iter() - .filter(|col| df.column(col).is_ok()) - .cloned() - .collect(); - df.select(cols)? - } - _ => df, - }; - - // Output - super::output(&mut df, output.as_str()) -} diff --git a/src/cmd/list/mod.rs b/src/cmd/list/mod.rs index 8bba054..b9edf1b 100644 --- a/src/cmd/list/mod.rs +++ b/src/cmd/list/mod.rs @@ -11,7 +11,6 @@ pub(super) mod plans; pub(super) mod projects; pub(super) mod service_instances; pub(super) mod services; -pub(super) mod ssh_keys; pub(super) mod transforms; pub use output::{output, output_empty_result_of_unknown_schema}; @@ -55,9 +54,6 @@ pub enum Subcommand { #[command(name = "service-instances", alias = "serviceInstances")] ServiceInstances(service_instances::Opts), - - #[command(name = "ssh-keys", alias = "sshKeys")] - SshKeys(ssh_keys::Opts), } pub async fn run(subcommand: Subcommand) -> Result<(), Box> { @@ -92,9 +88,6 @@ pub async fn run(subcommand: Subcommand) -> Result<(), Box { service_instances::run(offset, limit, output).await?; } - Subcommand::SshKeys(ssh_keys::Opts { offset, limit, output }) => { - ssh_keys::run(offset, limit, output).await?; - } } Ok(()) } diff --git a/src/cmd/list/ssh_keys.rs b/src/cmd/list/ssh_keys.rs deleted file mode 100644 index 00a7cb6..0000000 --- a/src/cmd/list/ssh_keys.rs +++ /dev/null @@ -1,52 +0,0 @@ -use crate::apiclient; -use crate::protocol::saas_rs::user::v1::FindManySshKeysRequest; -use clap::Parser; -use polars::prelude::*; -use std::io::Cursor; - -pub const PS_COLUMNS: &[&str] = &["id", "name"]; - -#[derive(Debug, Parser)] -pub struct Opts { - #[arg(long = "limit")] - pub limit: Option, - - #[arg(long = "offset")] - pub offset: Option, - - /// Output format - #[arg(short = 'o', long = "output", default_value = "ps", value_parser = clap::builder::PossibleValuesParser::new(crate::OUTPUTS) - )] - pub(super) output: String, -} - -pub async fn run(offset: Option, limit: Option, output: String) -> Result<(), Box> { - // Request all records - let mut client = apiclient::new_user_service_client().await?; - let req = FindManySshKeysRequest { - filter: None, - field_mask: None, - limit, - offset, - }; - let res = client.find_many_ssh_keys(req).await?.into_inner(); - - // Without a schema, Polars chokes parsing an empty json array - if res.ssh_keys.is_empty() { - return super::output_empty_result_of_unknown_schema(&output); - } - - // Convert to dataframe in preparation for output - let json = serde_json::to_vec(&res.ssh_keys)?; - let file = Cursor::new(json); - let df = JsonReader::new(file).finish()?; - - // Apply type-specific narrow formatting - let mut df = match output.as_str() { - "ps" => super::select_existing_cols(df, PS_COLUMNS)?, - _ => df, - }; - - // Output - super::output(&mut df, output.as_str()) -} diff --git a/src/kind.rs b/src/kind.rs deleted file mode 100644 index 2336bb3..0000000 --- a/src/kind.rs +++ /dev/null @@ -1,15 +0,0 @@ -use serde::Deserialize; - -#[derive(Debug, Deserialize, PartialEq)] -pub enum Kind { - Account, - ApiKey, - Plan, - Service, -} - -#[derive(Debug, Deserialize)] -struct Any { - #[allow(dead_code)] - kind: Option, -} diff --git a/src/main.rs b/src/main.rs index b7bb5da..7f80ea7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,6 @@ mod apiclient; mod cmd; mod config; mod consts; -mod kind; pub(crate) mod protocol; pub(crate) mod util; diff --git a/src/protocol/saas_rs.user.v1.rs b/src/protocol/saas_rs.user.v1.rs index 7bc90fa..5bf3ad0 100644 --- a/src/protocol/saas_rs.user.v1.rs +++ b/src/protocol/saas_rs.user.v1.rs @@ -208,8 +208,6 @@ pub struct Account { pub project_ids: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, #[prost(string, optional, tag = "8")] pub default_project_id: ::core::option::Option<::prost::alloc::string::String>, - #[prost(string, repeated, tag = "9")] - pub ssh_key_ids: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, #[prost(message, optional, tag = "1000")] pub created_at: ::core::option::Option<::pbjson_types::Timestamp>, #[prost(string, optional, tag = "1001")] @@ -2135,109 +2133,6 @@ pub struct ValidateServiceResponse { #[prost(message, repeated, tag = "1")] pub errors: ::prost::alloc::vec::Vec, } -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct SshKey { - #[prost(string, tag = "1")] - pub id: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub name: ::prost::alloc::string::String, - #[prost(string, tag = "3")] - pub fingerprint: ::prost::alloc::string::String, - #[prost(string, tag = "4")] - pub public_key: ::prost::alloc::string::String, - #[prost(message, optional, tag = "1000")] - pub created_at: ::core::option::Option<::pbjson_types::Timestamp>, - #[prost(string, optional, tag = "1001")] - pub created_by_account_id: ::core::option::Option<::prost::alloc::string::String>, - #[prost(message, optional, tag = "1002")] - pub deleted_at: ::core::option::Option<::pbjson_types::Timestamp>, - #[prost(string, optional, tag = "1003")] - pub deleted_by_account_id: ::core::option::Option<::prost::alloc::string::String>, - #[prost(message, optional, tag = "1004")] - pub updated_at: ::core::option::Option<::pbjson_types::Timestamp>, - #[prost(string, optional, tag = "1005")] - pub updated_by_account_id: ::core::option::Option<::prost::alloc::string::String>, - #[prost(oneof = "ssh_key::Owner", tags = "1006")] - pub owner: ::core::option::Option, -} -/// Nested message and enum types in `SshKey`. -pub mod ssh_key { - #[derive(Clone, PartialEq, Eq, Hash, ::prost::Oneof)] - pub enum Owner { - #[prost(string, tag = "1006")] - OwnerAccountId(::prost::alloc::string::String), - } -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct SshKeyFilter { - #[prost(string, optional, tag = "1")] - pub id: ::core::option::Option<::prost::alloc::string::String>, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct CreateSshKeyRequest { - #[prost(message, optional, tag = "1")] - pub ssh_key: ::core::option::Option, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct CreateSshKeyResponse { - #[prost(message, optional, tag = "1")] - pub ssh_key: ::core::option::Option, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct DeleteSshKeyRequest { - #[prost(string, tag = "1")] - pub id: ::prost::alloc::string::String, -} -#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] -pub struct DeleteSshKeyResponse {} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct FindSshKeyRequest { - #[prost(string, tag = "1")] - pub id: ::prost::alloc::string::String, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct FindSshKeyResponse { - #[prost(message, optional, tag = "1")] - pub ssh_key: ::core::option::Option, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct FindManySshKeysRequest { - #[prost(message, optional, tag = "1")] - pub filter: ::core::option::Option, - #[prost(message, optional, tag = "2")] - pub field_mask: ::core::option::Option<::pbjson_types::FieldMask>, - #[prost(uint32, optional, tag = "3")] - pub offset: ::core::option::Option, - #[prost(uint32, optional, tag = "4")] - pub limit: ::core::option::Option, -} -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct FindManySshKeysResponse { - #[prost(message, repeated, tag = "1")] - pub ssh_keys: ::prost::alloc::vec::Vec, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct UpdateSshKeyRequest { - #[prost(message, optional, tag = "1")] - pub ssh_key: ::core::option::Option, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct UpdateSshKeyResponse { - #[prost(message, optional, tag = "1")] - pub ssh_key: ::core::option::Option, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct ValidateSshKeyRequest { - #[prost(message, optional, tag = "1")] - pub ssh_key: ::core::option::Option, - #[prost(bool, tag = "2")] - pub existing: bool, -} -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct ValidateSshKeyResponse { - #[prost(message, repeated, tag = "1")] - pub errors: ::prost::alloc::vec::Vec, -} #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct PingRequest {} #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] @@ -2601,30 +2496,6 @@ pub mod user_client { ); self.inner.unary(req, path, codec).await } - pub async fn create_ssh_key( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/saas_rs.user.v1.User/CreateSshKey", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("saas_rs.user.v1.User", "CreateSshKey")); - self.inner.unary(req, path, codec).await - } pub async fn delete_account( &mut self, request: impl tonic::IntoRequest, @@ -2917,30 +2788,6 @@ pub mod user_client { ); self.inner.unary(req, path, codec).await } - pub async fn delete_ssh_key( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/saas_rs.user.v1.User/DeleteSshKey", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("saas_rs.user.v1.User", "DeleteSshKey")); - self.inner.unary(req, path, codec).await - } pub async fn find_account( &mut self, request: impl tonic::IntoRequest, @@ -3277,30 +3124,6 @@ pub mod user_client { .insert(GrpcMethod::new("saas_rs.user.v1.User", "FindServiceInstance")); self.inner.unary(req, path, codec).await } - pub async fn find_ssh_key( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/saas_rs.user.v1.User/FindSshKey", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("saas_rs.user.v1.User", "FindSshKey")); - self.inner.unary(req, path, codec).await - } pub async fn find_many_accounts( &mut self, request: impl tonic::IntoRequest, @@ -3619,30 +3442,6 @@ pub mod user_client { .insert(GrpcMethod::new("saas_rs.user.v1.User", "FindManyServices")); self.inner.unary(req, path, codec).await } - pub async fn find_many_ssh_keys( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/saas_rs.user.v1.User/FindManySshKeys", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("saas_rs.user.v1.User", "FindManySshKeys")); - self.inner.unary(req, path, codec).await - } pub async fn generate( &mut self, request: impl tonic::IntoRequest, @@ -4045,30 +3844,6 @@ pub mod user_client { ); self.inner.unary(req, path, codec).await } - pub async fn update_ssh_key( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/saas_rs.user.v1.User/UpdateSshKey", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("saas_rs.user.v1.User", "UpdateSshKey")); - self.inner.unary(req, path, codec).await - } pub async fn validate_account( &mut self, request: impl tonic::IntoRequest, @@ -4339,30 +4114,6 @@ pub mod user_client { ); self.inner.unary(req, path, codec).await } - pub async fn validate_ssh_key( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/saas_rs.user.v1.User/ValidateSshKey", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("saas_rs.user.v1.User", "ValidateSshKey")); - self.inner.unary(req, path, codec).await - } pub async fn download_file( &mut self, request: impl tonic::IntoRequest, @@ -4503,13 +4254,6 @@ pub mod user_server { tonic::Response, tonic::Status, >; - async fn create_ssh_key( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; async fn delete_account( &self, request: tonic::Request, @@ -4594,13 +4338,6 @@ pub mod user_server { tonic::Response, tonic::Status, >; - async fn delete_ssh_key( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; async fn find_account( &self, request: tonic::Request, @@ -4699,13 +4436,6 @@ pub mod user_server { tonic::Response, tonic::Status, >; - async fn find_ssh_key( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; async fn find_many_accounts( &self, request: tonic::Request, @@ -4797,13 +4527,6 @@ pub mod user_server { tonic::Response, tonic::Status, >; - async fn find_many_ssh_keys( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; async fn generate( &self, request: tonic::Request, @@ -4914,13 +4637,6 @@ pub mod user_server { tonic::Response, tonic::Status, >; - async fn update_ssh_key( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; async fn validate_account( &self, request: tonic::Request, @@ -4998,13 +4714,6 @@ pub mod user_server { tonic::Response, tonic::Status, >; - async fn validate_ssh_key( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; /// Server streaming response type for the DownloadFile method. type DownloadFileStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, @@ -5589,49 +5298,6 @@ pub mod user_server { }; Box::pin(fut) } - "/saas_rs.user.v1.User/CreateSshKey" => { - #[allow(non_camel_case_types)] - struct CreateSshKeySvc(pub Arc); - impl tonic::server::UnaryService - for CreateSshKeySvc { - type Response = super::CreateSshKeyResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::create_ssh_key(&inner, request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = CreateSshKeySvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/saas_rs.user.v1.User/DeleteAccount" => { #[allow(non_camel_case_types)] struct DeleteAccountSvc(pub Arc); @@ -6162,49 +5828,6 @@ pub mod user_server { }; Box::pin(fut) } - "/saas_rs.user.v1.User/DeleteSshKey" => { - #[allow(non_camel_case_types)] - struct DeleteSshKeySvc(pub Arc); - impl tonic::server::UnaryService - for DeleteSshKeySvc { - type Response = super::DeleteSshKeyResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::delete_ssh_key(&inner, request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = DeleteSshKeySvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/saas_rs.user.v1.User/FindAccount" => { #[allow(non_camel_case_types)] struct FindAccountSvc(pub Arc); @@ -6817,49 +6440,6 @@ pub mod user_server { }; Box::pin(fut) } - "/saas_rs.user.v1.User/FindSshKey" => { - #[allow(non_camel_case_types)] - struct FindSshKeySvc(pub Arc); - impl tonic::server::UnaryService - for FindSshKeySvc { - type Response = super::FindSshKeyResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::find_ssh_key(&inner, request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = FindSshKeySvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/saas_rs.user.v1.User/FindManyAccounts" => { #[allow(non_camel_case_types)] struct FindManyAccountsSvc(pub Arc); @@ -7449,51 +7029,6 @@ pub mod user_server { }; Box::pin(fut) } - "/saas_rs.user.v1.User/FindManySshKeys" => { - #[allow(non_camel_case_types)] - struct FindManySshKeysSvc(pub Arc); - impl< - T: User, - > tonic::server::UnaryService - for FindManySshKeysSvc { - type Response = super::FindManySshKeysResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::find_many_ssh_keys(&inner, request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = FindManySshKeysSvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/saas_rs.user.v1.User/Generate" => { #[allow(non_camel_case_types)] struct GenerateSvc(pub Arc); @@ -8241,49 +7776,6 @@ pub mod user_server { }; Box::pin(fut) } - "/saas_rs.user.v1.User/UpdateSshKey" => { - #[allow(non_camel_case_types)] - struct UpdateSshKeySvc(pub Arc); - impl tonic::server::UnaryService - for UpdateSshKeySvc { - type Response = super::UpdateSshKeyResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::update_ssh_key(&inner, request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = UpdateSshKeySvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/saas_rs.user.v1.User/ValidateAccount" => { #[allow(non_camel_case_types)] struct ValidateAccountSvc(pub Arc); @@ -8783,51 +8275,6 @@ pub mod user_server { }; Box::pin(fut) } - "/saas_rs.user.v1.User/ValidateSshKey" => { - #[allow(non_camel_case_types)] - struct ValidateSshKeySvc(pub Arc); - impl< - T: User, - > tonic::server::UnaryService - for ValidateSshKeySvc { - type Response = super::ValidateSshKeyResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::validate_ssh_key(&inner, request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = ValidateSshKeySvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/saas_rs.user.v1.User/DownloadFile" => { #[allow(non_camel_case_types)] struct DownloadFileSvc(pub Arc); diff --git a/src/protocol/saas_rs.user.v1.serde.rs b/src/protocol/saas_rs.user.v1.serde.rs index a487aea..8c77faa 100644 --- a/src/protocol/saas_rs.user.v1.serde.rs +++ b/src/protocol/saas_rs.user.v1.serde.rs @@ -215,9 +215,6 @@ impl serde::Serialize for Account { if true { len += 1; } - if true { - len += 1; - } if self.owner.is_some() { len += 1; } @@ -246,9 +243,6 @@ impl serde::Serialize for Account { if let Some(v) = self.default_project_id.as_ref() { struct_ser.serialize_field("defaultProjectId", v)?; } - if true { - struct_ser.serialize_field("sshKeyIds", &self.ssh_key_ids)?; - } if let Some(v) = self.created_at.as_ref() { struct_ser.serialize_field("createdAt", v)?; } @@ -296,8 +290,6 @@ impl<'de> serde::Deserialize<'de> for Account { "projectIds", "default_project_id", "defaultProjectId", - "ssh_key_ids", - "sshKeyIds", "created_at", "createdAt", "created_by_account_id", @@ -324,7 +316,6 @@ impl<'de> serde::Deserialize<'de> for Account { ServiceInstanceIds, ProjectIds, DefaultProjectId, - SshKeyIds, CreatedAt, CreatedByAccountId, DeletedAt, @@ -362,7 +353,6 @@ impl<'de> serde::Deserialize<'de> for Account { "serviceInstanceIds" | "service_instance_ids" => Ok(GeneratedField::ServiceInstanceIds), "projectIds" | "project_ids" => Ok(GeneratedField::ProjectIds), "defaultProjectId" | "default_project_id" => Ok(GeneratedField::DefaultProjectId), - "sshKeyIds" | "ssh_key_ids" => Ok(GeneratedField::SshKeyIds), "createdAt" | "created_at" => Ok(GeneratedField::CreatedAt), "createdByAccountId" | "created_by_account_id" => Ok(GeneratedField::CreatedByAccountId), "deletedAt" | "deleted_at" => Ok(GeneratedField::DeletedAt), @@ -397,7 +387,6 @@ impl<'de> serde::Deserialize<'de> for Account { let mut service_instance_ids__ = None; let mut project_ids__ = None; let mut default_project_id__ = None; - let mut ssh_key_ids__ = None; let mut created_at__ = None; let mut created_by_account_id__ = None; let mut deleted_at__ = None; @@ -455,12 +444,6 @@ impl<'de> serde::Deserialize<'de> for Account { } default_project_id__ = map_.next_value()?; } - GeneratedField::SshKeyIds => { - if ssh_key_ids__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKeyIds")); - } - ssh_key_ids__ = Some(map_.next_value()?); - } GeneratedField::CreatedAt => { if created_at__.is_some() { return Err(serde::de::Error::duplicate_field("createdAt")); @@ -517,7 +500,6 @@ impl<'de> serde::Deserialize<'de> for Account { service_instance_ids: service_instance_ids__.unwrap_or_default(), project_ids: project_ids__.unwrap_or_default(), default_project_id: default_project_id__, - ssh_key_ids: ssh_key_ids__.unwrap_or_default(), created_at: created_at__, created_by_account_id: created_by_account_id__, deleted_at: deleted_at__, @@ -3801,198 +3783,6 @@ impl<'de> serde::Deserialize<'de> for CreateServiceResponse { deserializer.deserialize_struct("saas_rs.user.v1.CreateServiceResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for CreateSshKeyRequest { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.CreateSshKeyRequest", len)?; - if let Some(v) = self.ssh_key.as_ref() { - struct_ser.serialize_field("sshKey", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for CreateSshKeyRequest { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "ssh_key", - "sshKey", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - SshKey, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "sshKey" | "ssh_key" => Ok(GeneratedField::SshKey), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = CreateSshKeyRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.CreateSshKeyRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut ssh_key__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::SshKey => { - if ssh_key__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKey")); - } - ssh_key__ = map_.next_value()?; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(CreateSshKeyRequest { - ssh_key: ssh_key__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.CreateSshKeyRequest", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for CreateSshKeyResponse { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.CreateSshKeyResponse", len)?; - if let Some(v) = self.ssh_key.as_ref() { - struct_ser.serialize_field("sshKey", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for CreateSshKeyResponse { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "ssh_key", - "sshKey", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - SshKey, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "sshKey" | "ssh_key" => Ok(GeneratedField::SshKey), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = CreateSshKeyResponse; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.CreateSshKeyResponse") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut ssh_key__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::SshKey => { - if ssh_key__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKey")); - } - ssh_key__ = map_.next_value()?; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(CreateSshKeyResponse { - ssh_key: ssh_key__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.CreateSshKeyResponse", FIELDS, GeneratedVisitor) - } -} impl serde::Serialize for DeleteAccountRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -5997,7 +5787,7 @@ impl<'de> serde::Deserialize<'de> for DeleteServiceResponse { deserializer.deserialize_struct("saas_rs.user.v1.DeleteServiceResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for DeleteSshKeyRequest { +impl serde::Serialize for DownloadFileRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -6008,14 +5798,14 @@ impl serde::Serialize for DeleteSshKeyRequest { if true { len += 1; } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.DeleteSshKeyRequest", len)?; + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.DownloadFileRequest", len)?; if true { struct_ser.serialize_field("id", &self.id)?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for DeleteSshKeyRequest { +impl<'de> serde::Deserialize<'de> for DownloadFileRequest { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where @@ -6060,13 +5850,13 @@ impl<'de> serde::Deserialize<'de> for DeleteSshKeyRequest { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = DeleteSshKeyRequest; + type Value = DownloadFileRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.DeleteSshKeyRequest") + formatter.write_str("struct saas_rs.user.v1.DownloadFileRequest") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -6084,37 +5874,47 @@ impl<'de> serde::Deserialize<'de> for DeleteSshKeyRequest { } } } - Ok(DeleteSshKeyRequest { + Ok(DownloadFileRequest { id: id__.unwrap_or_default(), }) } } - deserializer.deserialize_struct("saas_rs.user.v1.DeleteSshKeyRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("saas_rs.user.v1.DownloadFileRequest", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for DeleteSshKeyResponse { +impl serde::Serialize for DownloadFileResponse { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where S: serde::Serializer, { use serde::ser::SerializeStruct; - let len = 0; - let struct_ser = serializer.serialize_struct("saas_rs.user.v1.DeleteSshKeyResponse", len)?; + let mut len = 0; + if true { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.DownloadFileResponse", len)?; + if true { + #[allow(clippy::needless_borrow)] + #[allow(clippy::needless_borrows_for_generic_args)] + struct_ser.serialize_field("chunk", pbjson::private::base64::encode(&self.chunk).as_str())?; + } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for DeleteSshKeyResponse { +impl<'de> serde::Deserialize<'de> for DownloadFileResponse { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where D: serde::Deserializer<'de>, { const FIELDS: &[&str] = &[ + "chunk", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { + Chunk, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -6136,7 +5936,10 @@ impl<'de> serde::Deserialize<'de> for DeleteSshKeyResponse { where E: serde::de::Error, { - Ok(GeneratedField::__SkipField__) + match value { + "chunk" => Ok(GeneratedField::Chunk), + _ => Ok(GeneratedField::__SkipField__), + } } } deserializer.deserialize_identifier(GeneratedVisitor) @@ -6144,27 +5947,41 @@ impl<'de> serde::Deserialize<'de> for DeleteSshKeyResponse { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = DeleteSshKeyResponse; + type Value = DownloadFileResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.DeleteSshKeyResponse") + formatter.write_str("struct saas_rs.user.v1.DownloadFileResponse") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map_.next_key::()?.is_some() { - let _ = map_.next_value::()?; + let mut chunk__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::Chunk => { + if chunk__.is_some() { + return Err(serde::de::Error::duplicate_field("chunk")); + } + chunk__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } } - Ok(DeleteSshKeyResponse { + Ok(DownloadFileResponse { + chunk: chunk__.unwrap_or_default(), }) } } - deserializer.deserialize_struct("saas_rs.user.v1.DeleteSshKeyResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("saas_rs.user.v1.DownloadFileResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for DownloadFileRequest { +impl serde::Serialize for ErrorObject { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -6175,14 +5992,44 @@ impl serde::Serialize for DownloadFileRequest { if true { len += 1; } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.DownloadFileRequest", len)?; + if true { + len += 1; + } + if true { + len += 1; + } + if true { + len += 1; + } + if true { + len += 1; + } + if true { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.ErrorObject", len)?; if true { struct_ser.serialize_field("id", &self.id)?; } + if true { + struct_ser.serialize_field("title", &self.title)?; + } + if true { + struct_ser.serialize_field("detail", &self.detail)?; + } + if true { + struct_ser.serialize_field("status", &self.status)?; + } + if true { + struct_ser.serialize_field("code", &self.code)?; + } + if let Some(v) = self.metadata.as_ref() { + struct_ser.serialize_field("metadata", v)?; + } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for DownloadFileRequest { +impl<'de> serde::Deserialize<'de> for ErrorObject { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where @@ -6190,245 +6037,21 @@ impl<'de> serde::Deserialize<'de> for DownloadFileRequest { { const FIELDS: &[&str] = &[ "id", + "title", + "detail", + "status", + "code", + "metadata", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Id, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "id" => Ok(GeneratedField::Id), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = DownloadFileRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.DownloadFileRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut id__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Id => { - if id__.is_some() { - return Err(serde::de::Error::duplicate_field("id")); - } - id__ = Some(map_.next_value()?); - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(DownloadFileRequest { - id: id__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.DownloadFileRequest", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for DownloadFileResponse { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.DownloadFileResponse", len)?; - if true { - #[allow(clippy::needless_borrow)] - #[allow(clippy::needless_borrows_for_generic_args)] - struct_ser.serialize_field("chunk", pbjson::private::base64::encode(&self.chunk).as_str())?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for DownloadFileResponse { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "chunk", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Chunk, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "chunk" => Ok(GeneratedField::Chunk), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = DownloadFileResponse; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.DownloadFileResponse") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut chunk__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Chunk => { - if chunk__.is_some() { - return Err(serde::de::Error::duplicate_field("chunk")); - } - chunk__ = - Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) - ; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(DownloadFileResponse { - chunk: chunk__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.DownloadFileResponse", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for ErrorObject { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.ErrorObject", len)?; - if true { - struct_ser.serialize_field("id", &self.id)?; - } - if true { - struct_ser.serialize_field("title", &self.title)?; - } - if true { - struct_ser.serialize_field("detail", &self.detail)?; - } - if true { - struct_ser.serialize_field("status", &self.status)?; - } - if true { - struct_ser.serialize_field("code", &self.code)?; - } - if let Some(v) = self.metadata.as_ref() { - struct_ser.serialize_field("metadata", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for ErrorObject { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "id", - "title", - "detail", - "status", - "code", - "metadata", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Id, - Title, - Detail, - Status, - Code, - Metadata, + Title, + Detail, + Status, + Code, + Metadata, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -12281,7 +11904,7 @@ impl<'de> serde::Deserialize<'de> for FindManyServicesResponse { deserializer.deserialize_struct("saas_rs.user.v1.FindManyServicesResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for FindManySshKeysRequest { +impl serde::Serialize for FindPlanRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -12292,256 +11915,9 @@ impl serde::Serialize for FindManySshKeysRequest { if true { len += 1; } + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.FindPlanRequest", len)?; if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.FindManySshKeysRequest", len)?; - if let Some(v) = self.filter.as_ref() { - struct_ser.serialize_field("filter", v)?; - } - if let Some(v) = self.field_mask.as_ref() { - struct_ser.serialize_field("fieldMask", v)?; - } - if let Some(v) = self.offset.as_ref() { - struct_ser.serialize_field("offset", v)?; - } - if let Some(v) = self.limit.as_ref() { - struct_ser.serialize_field("limit", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for FindManySshKeysRequest { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "filter", - "field_mask", - "fieldMask", - "offset", - "limit", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Filter, - FieldMask, - Offset, - Limit, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "filter" => Ok(GeneratedField::Filter), - "fieldMask" | "field_mask" => Ok(GeneratedField::FieldMask), - "offset" => Ok(GeneratedField::Offset), - "limit" => Ok(GeneratedField::Limit), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = FindManySshKeysRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.FindManySshKeysRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut filter__ = None; - let mut field_mask__ = None; - let mut offset__ = None; - let mut limit__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Filter => { - if filter__.is_some() { - return Err(serde::de::Error::duplicate_field("filter")); - } - filter__ = map_.next_value()?; - } - GeneratedField::FieldMask => { - if field_mask__.is_some() { - return Err(serde::de::Error::duplicate_field("fieldMask")); - } - field_mask__ = map_.next_value()?; - } - GeneratedField::Offset => { - if offset__.is_some() { - return Err(serde::de::Error::duplicate_field("offset")); - } - offset__ = - map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) - ; - } - GeneratedField::Limit => { - if limit__.is_some() { - return Err(serde::de::Error::duplicate_field("limit")); - } - limit__ = - map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) - ; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(FindManySshKeysRequest { - filter: filter__, - field_mask: field_mask__, - offset: offset__, - limit: limit__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.FindManySshKeysRequest", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for FindManySshKeysResponse { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.FindManySshKeysResponse", len)?; - if true { - struct_ser.serialize_field("sshKeys", &self.ssh_keys)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for FindManySshKeysResponse { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "ssh_keys", - "sshKeys", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - SshKeys, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "sshKeys" | "ssh_keys" => Ok(GeneratedField::SshKeys), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = FindManySshKeysResponse; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.FindManySshKeysResponse") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut ssh_keys__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::SshKeys => { - if ssh_keys__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKeys")); - } - ssh_keys__ = Some(map_.next_value()?); - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(FindManySshKeysResponse { - ssh_keys: ssh_keys__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.FindManySshKeysResponse", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for FindPlanRequest { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.FindPlanRequest", len)?; - if true { - struct_ser.serialize_field("id", &self.id)?; + struct_ser.serialize_field("id", &self.id)?; } struct_ser.end() } @@ -13289,7 +12665,7 @@ impl<'de> serde::Deserialize<'de> for FindServiceResponse { deserializer.deserialize_struct("saas_rs.user.v1.FindServiceResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for FindSshKeyRequest { +impl serde::Serialize for GenerateRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -13300,252 +12676,61 @@ impl serde::Serialize for FindSshKeyRequest { if true { len += 1; } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.FindSshKeyRequest", len)?; + if self.snapshot.is_some() { + len += 1; + } + if self.what.is_some() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.GenerateRequest", len)?; if true { - struct_ser.serialize_field("id", &self.id)?; + struct_ser.serialize_field("projectId", &self.project_id)?; + } + if let Some(v) = self.snapshot.as_ref() { + match v { + generate_request::Snapshot::GitCommit(v) => { + struct_ser.serialize_field("gitCommit", v)?; + } + generate_request::Snapshot::Archive(v) => { + struct_ser.serialize_field("archive", v)?; + } + } + } + if let Some(v) = self.what.as_ref() { + match v { + generate_request::What::Init(v) => { + struct_ser.serialize_field("init", v)?; + } + generate_request::What::Controller(v) => { + struct_ser.serialize_field("controller", v)?; + } + generate_request::What::Model(v) => { + struct_ser.serialize_field("model", v)?; + } + generate_request::What::Resource(v) => { + struct_ser.serialize_field("resource", v)?; + } + generate_request::What::Service(v) => { + struct_ser.serialize_field("service", v)?; + } + generate_request::What::Feature(v) => { + struct_ser.serialize_field("feature", v)?; + } + generate_request::What::UseStorageProvider(v) => { + struct_ser.serialize_field("useStorageProvider", v)?; + } + generate_request::What::UseIdentityProvider(v) => { + struct_ser.serialize_field("useIdentityProvider", v)?; + } + generate_request::What::UsePaymentProvider(v) => { + struct_ser.serialize_field("usePaymentProvider", v)?; + } + } } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for FindSshKeyRequest { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "id", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Id, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "id" => Ok(GeneratedField::Id), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = FindSshKeyRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.FindSshKeyRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut id__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Id => { - if id__.is_some() { - return Err(serde::de::Error::duplicate_field("id")); - } - id__ = Some(map_.next_value()?); - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(FindSshKeyRequest { - id: id__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.FindSshKeyRequest", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for FindSshKeyResponse { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.FindSshKeyResponse", len)?; - if let Some(v) = self.ssh_key.as_ref() { - struct_ser.serialize_field("sshKey", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for FindSshKeyResponse { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "ssh_key", - "sshKey", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - SshKey, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "sshKey" | "ssh_key" => Ok(GeneratedField::SshKey), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = FindSshKeyResponse; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.FindSshKeyResponse") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut ssh_key__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::SshKey => { - if ssh_key__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKey")); - } - ssh_key__ = map_.next_value()?; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(FindSshKeyResponse { - ssh_key: ssh_key__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.FindSshKeyResponse", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for GenerateRequest { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - if self.snapshot.is_some() { - len += 1; - } - if self.what.is_some() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.GenerateRequest", len)?; - if true { - struct_ser.serialize_field("projectId", &self.project_id)?; - } - if let Some(v) = self.snapshot.as_ref() { - match v { - generate_request::Snapshot::GitCommit(v) => { - struct_ser.serialize_field("gitCommit", v)?; - } - generate_request::Snapshot::Archive(v) => { - struct_ser.serialize_field("archive", v)?; - } - } - } - if let Some(v) = self.what.as_ref() { - match v { - generate_request::What::Init(v) => { - struct_ser.serialize_field("init", v)?; - } - generate_request::What::Controller(v) => { - struct_ser.serialize_field("controller", v)?; - } - generate_request::What::Model(v) => { - struct_ser.serialize_field("model", v)?; - } - generate_request::What::Resource(v) => { - struct_ser.serialize_field("resource", v)?; - } - generate_request::What::Service(v) => { - struct_ser.serialize_field("service", v)?; - } - generate_request::What::Feature(v) => { - struct_ser.serialize_field("feature", v)?; - } - generate_request::What::UseStorageProvider(v) => { - struct_ser.serialize_field("useStorageProvider", v)?; - } - generate_request::What::UseIdentityProvider(v) => { - struct_ser.serialize_field("useIdentityProvider", v)?; - } - generate_request::What::UsePaymentProvider(v) => { - struct_ser.serialize_field("usePaymentProvider", v)?; - } - } - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for GenerateRequest { +impl<'de> serde::Deserialize<'de> for GenerateRequest { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where @@ -21511,439 +20696,19 @@ impl serde::Serialize for ServiceInstanceFilter { if let Some(v) = self.plan_id.as_ref() { struct_ser.serialize_field("planId", v)?; } - if let Some(v) = self.service_id.as_ref() { - struct_ser.serialize_field("serviceId", v)?; - } - if let Some(v) = self.service_tag.as_ref() { - struct_ser.serialize_field("serviceTag", v)?; - } - if let Some(v) = self.owner_account_id.as_ref() { - struct_ser.serialize_field("ownerAccountId", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for ServiceInstanceFilter { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "id", - "plan_id", - "planId", - "service_id", - "serviceId", - "service_tag", - "serviceTag", - "owner_account_id", - "ownerAccountId", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Id, - PlanId, - ServiceId, - ServiceTag, - OwnerAccountId, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "id" => Ok(GeneratedField::Id), - "planId" | "plan_id" => Ok(GeneratedField::PlanId), - "serviceId" | "service_id" => Ok(GeneratedField::ServiceId), - "serviceTag" | "service_tag" => Ok(GeneratedField::ServiceTag), - "ownerAccountId" | "owner_account_id" => Ok(GeneratedField::OwnerAccountId), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = ServiceInstanceFilter; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.ServiceInstanceFilter") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut id__ = None; - let mut plan_id__ = None; - let mut service_id__ = None; - let mut service_tag__ = None; - let mut owner_account_id__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Id => { - if id__.is_some() { - return Err(serde::de::Error::duplicate_field("id")); - } - id__ = map_.next_value()?; - } - GeneratedField::PlanId => { - if plan_id__.is_some() { - return Err(serde::de::Error::duplicate_field("planId")); - } - plan_id__ = map_.next_value()?; - } - GeneratedField::ServiceId => { - if service_id__.is_some() { - return Err(serde::de::Error::duplicate_field("serviceId")); - } - service_id__ = map_.next_value()?; - } - GeneratedField::ServiceTag => { - if service_tag__.is_some() { - return Err(serde::de::Error::duplicate_field("serviceTag")); - } - service_tag__ = map_.next_value()?; - } - GeneratedField::OwnerAccountId => { - if owner_account_id__.is_some() { - return Err(serde::de::Error::duplicate_field("ownerAccountId")); - } - owner_account_id__ = map_.next_value()?; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(ServiceInstanceFilter { - id: id__, - plan_id: plan_id__, - service_id: service_id__, - service_tag: service_tag__, - owner_account_id: owner_account_id__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.ServiceInstanceFilter", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for SshKey { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if true { - len += 1; - } - if self.owner.is_some() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.SshKey", len)?; - if true { - struct_ser.serialize_field("id", &self.id)?; - } - if true { - struct_ser.serialize_field("name", &self.name)?; - } - if true { - struct_ser.serialize_field("fingerprint", &self.fingerprint)?; - } - if true { - struct_ser.serialize_field("publicKey", &self.public_key)?; - } - if let Some(v) = self.created_at.as_ref() { - struct_ser.serialize_field("createdAt", v)?; - } - if let Some(v) = self.created_by_account_id.as_ref() { - struct_ser.serialize_field("createdByAccountId", v)?; - } - if let Some(v) = self.deleted_at.as_ref() { - struct_ser.serialize_field("deletedAt", v)?; - } - if let Some(v) = self.deleted_by_account_id.as_ref() { - struct_ser.serialize_field("deletedByAccountId", v)?; - } - if let Some(v) = self.updated_at.as_ref() { - struct_ser.serialize_field("updatedAt", v)?; - } - if let Some(v) = self.updated_by_account_id.as_ref() { - struct_ser.serialize_field("updatedByAccountId", v)?; - } - if let Some(v) = self.owner.as_ref() { - match v { - ssh_key::Owner::OwnerAccountId(v) => { - struct_ser.serialize_field("ownerAccountId", v)?; - } - } - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for SshKey { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "id", - "name", - "fingerprint", - "public_key", - "publicKey", - "created_at", - "createdAt", - "created_by_account_id", - "createdByAccountId", - "deleted_at", - "deletedAt", - "deleted_by_account_id", - "deletedByAccountId", - "updated_at", - "updatedAt", - "updated_by_account_id", - "updatedByAccountId", - "owner_account_id", - "ownerAccountId", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Id, - Name, - Fingerprint, - PublicKey, - CreatedAt, - CreatedByAccountId, - DeletedAt, - DeletedByAccountId, - UpdatedAt, - UpdatedByAccountId, - OwnerAccountId, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "id" => Ok(GeneratedField::Id), - "name" => Ok(GeneratedField::Name), - "fingerprint" => Ok(GeneratedField::Fingerprint), - "publicKey" | "public_key" => Ok(GeneratedField::PublicKey), - "createdAt" | "created_at" => Ok(GeneratedField::CreatedAt), - "createdByAccountId" | "created_by_account_id" => Ok(GeneratedField::CreatedByAccountId), - "deletedAt" | "deleted_at" => Ok(GeneratedField::DeletedAt), - "deletedByAccountId" | "deleted_by_account_id" => Ok(GeneratedField::DeletedByAccountId), - "updatedAt" | "updated_at" => Ok(GeneratedField::UpdatedAt), - "updatedByAccountId" | "updated_by_account_id" => Ok(GeneratedField::UpdatedByAccountId), - "ownerAccountId" | "owner_account_id" => Ok(GeneratedField::OwnerAccountId), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = SshKey; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.SshKey") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut id__ = None; - let mut name__ = None; - let mut fingerprint__ = None; - let mut public_key__ = None; - let mut created_at__ = None; - let mut created_by_account_id__ = None; - let mut deleted_at__ = None; - let mut deleted_by_account_id__ = None; - let mut updated_at__ = None; - let mut updated_by_account_id__ = None; - let mut owner__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Id => { - if id__.is_some() { - return Err(serde::de::Error::duplicate_field("id")); - } - id__ = Some(map_.next_value()?); - } - GeneratedField::Name => { - if name__.is_some() { - return Err(serde::de::Error::duplicate_field("name")); - } - name__ = Some(map_.next_value()?); - } - GeneratedField::Fingerprint => { - if fingerprint__.is_some() { - return Err(serde::de::Error::duplicate_field("fingerprint")); - } - fingerprint__ = Some(map_.next_value()?); - } - GeneratedField::PublicKey => { - if public_key__.is_some() { - return Err(serde::de::Error::duplicate_field("publicKey")); - } - public_key__ = Some(map_.next_value()?); - } - GeneratedField::CreatedAt => { - if created_at__.is_some() { - return Err(serde::de::Error::duplicate_field("createdAt")); - } - created_at__ = map_.next_value()?; - } - GeneratedField::CreatedByAccountId => { - if created_by_account_id__.is_some() { - return Err(serde::de::Error::duplicate_field("createdByAccountId")); - } - created_by_account_id__ = map_.next_value()?; - } - GeneratedField::DeletedAt => { - if deleted_at__.is_some() { - return Err(serde::de::Error::duplicate_field("deletedAt")); - } - deleted_at__ = map_.next_value()?; - } - GeneratedField::DeletedByAccountId => { - if deleted_by_account_id__.is_some() { - return Err(serde::de::Error::duplicate_field("deletedByAccountId")); - } - deleted_by_account_id__ = map_.next_value()?; - } - GeneratedField::UpdatedAt => { - if updated_at__.is_some() { - return Err(serde::de::Error::duplicate_field("updatedAt")); - } - updated_at__ = map_.next_value()?; - } - GeneratedField::UpdatedByAccountId => { - if updated_by_account_id__.is_some() { - return Err(serde::de::Error::duplicate_field("updatedByAccountId")); - } - updated_by_account_id__ = map_.next_value()?; - } - GeneratedField::OwnerAccountId => { - if owner__.is_some() { - return Err(serde::de::Error::duplicate_field("ownerAccountId")); - } - owner__ = map_.next_value::<::std::option::Option<_>>()?.map(ssh_key::Owner::OwnerAccountId); - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(SshKey { - id: id__.unwrap_or_default(), - name: name__.unwrap_or_default(), - fingerprint: fingerprint__.unwrap_or_default(), - public_key: public_key__.unwrap_or_default(), - created_at: created_at__, - created_by_account_id: created_by_account_id__, - deleted_at: deleted_at__, - deleted_by_account_id: deleted_by_account_id__, - updated_at: updated_at__, - updated_by_account_id: updated_by_account_id__, - owner: owner__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.SshKey", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for SshKeyFilter { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.SshKeyFilter", len)?; - if let Some(v) = self.id.as_ref() { - struct_ser.serialize_field("id", v)?; + if let Some(v) = self.service_id.as_ref() { + struct_ser.serialize_field("serviceId", v)?; + } + if let Some(v) = self.service_tag.as_ref() { + struct_ser.serialize_field("serviceTag", v)?; + } + if let Some(v) = self.owner_account_id.as_ref() { + struct_ser.serialize_field("ownerAccountId", v)?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for SshKeyFilter { +impl<'de> serde::Deserialize<'de> for ServiceInstanceFilter { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where @@ -21951,11 +20716,23 @@ impl<'de> serde::Deserialize<'de> for SshKeyFilter { { const FIELDS: &[&str] = &[ "id", + "plan_id", + "planId", + "service_id", + "serviceId", + "service_tag", + "serviceTag", + "owner_account_id", + "ownerAccountId", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Id, + PlanId, + ServiceId, + ServiceTag, + OwnerAccountId, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -21979,6 +20756,10 @@ impl<'de> serde::Deserialize<'de> for SshKeyFilter { { match value { "id" => Ok(GeneratedField::Id), + "planId" | "plan_id" => Ok(GeneratedField::PlanId), + "serviceId" | "service_id" => Ok(GeneratedField::ServiceId), + "serviceTag" | "service_tag" => Ok(GeneratedField::ServiceTag), + "ownerAccountId" | "owner_account_id" => Ok(GeneratedField::OwnerAccountId), _ => Ok(GeneratedField::__SkipField__), } } @@ -21988,17 +20769,21 @@ impl<'de> serde::Deserialize<'de> for SshKeyFilter { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = SshKeyFilter; + type Value = ServiceInstanceFilter; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.SshKeyFilter") + formatter.write_str("struct saas_rs.user.v1.ServiceInstanceFilter") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; + let mut plan_id__ = None; + let mut service_id__ = None; + let mut service_tag__ = None; + let mut owner_account_id__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { @@ -22007,17 +20792,45 @@ impl<'de> serde::Deserialize<'de> for SshKeyFilter { } id__ = map_.next_value()?; } + GeneratedField::PlanId => { + if plan_id__.is_some() { + return Err(serde::de::Error::duplicate_field("planId")); + } + plan_id__ = map_.next_value()?; + } + GeneratedField::ServiceId => { + if service_id__.is_some() { + return Err(serde::de::Error::duplicate_field("serviceId")); + } + service_id__ = map_.next_value()?; + } + GeneratedField::ServiceTag => { + if service_tag__.is_some() { + return Err(serde::de::Error::duplicate_field("serviceTag")); + } + service_tag__ = map_.next_value()?; + } + GeneratedField::OwnerAccountId => { + if owner_account_id__.is_some() { + return Err(serde::de::Error::duplicate_field("ownerAccountId")); + } + owner_account_id__ = map_.next_value()?; + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } } } - Ok(SshKeyFilter { + Ok(ServiceInstanceFilter { id: id__, + plan_id: plan_id__, + service_id: service_id__, + service_tag: service_tag__, + owner_account_id: owner_account_id__, }) } } - deserializer.deserialize_struct("saas_rs.user.v1.SshKeyFilter", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("saas_rs.user.v1.ServiceInstanceFilter", FIELDS, GeneratedVisitor) } } impl serde::Serialize for UpdateAccountRequest { @@ -24026,198 +22839,7 @@ impl<'de> serde::Deserialize<'de> for UpdateServiceInstanceRequest { deserializer.deserialize_struct("saas_rs.user.v1.UpdateServiceInstanceRequest", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for UpdateServiceInstanceResponse { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateServiceInstanceResponse", len)?; - if let Some(v) = self.service_instance.as_ref() { - struct_ser.serialize_field("serviceInstance", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for UpdateServiceInstanceResponse { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "service_instance", - "serviceInstance", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - ServiceInstance, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "serviceInstance" | "service_instance" => Ok(GeneratedField::ServiceInstance), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = UpdateServiceInstanceResponse; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.UpdateServiceInstanceResponse") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut service_instance__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::ServiceInstance => { - if service_instance__.is_some() { - return Err(serde::de::Error::duplicate_field("serviceInstance")); - } - service_instance__ = map_.next_value()?; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(UpdateServiceInstanceResponse { - service_instance: service_instance__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.UpdateServiceInstanceResponse", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for UpdateServiceRequest { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateServiceRequest", len)?; - if let Some(v) = self.service.as_ref() { - struct_ser.serialize_field("service", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for UpdateServiceRequest { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "service", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Service, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "service" => Ok(GeneratedField::Service), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = UpdateServiceRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.UpdateServiceRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut service__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Service => { - if service__.is_some() { - return Err(serde::de::Error::duplicate_field("service")); - } - service__ = map_.next_value()?; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(UpdateServiceRequest { - service: service__, - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.UpdateServiceRequest", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for UpdateServiceResponse { +impl serde::Serialize for UpdateServiceInstanceResponse { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -24228,26 +22850,27 @@ impl serde::Serialize for UpdateServiceResponse { if true { len += 1; } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateServiceResponse", len)?; - if let Some(v) = self.service.as_ref() { - struct_ser.serialize_field("service", v)?; + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateServiceInstanceResponse", len)?; + if let Some(v) = self.service_instance.as_ref() { + struct_ser.serialize_field("serviceInstance", v)?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for UpdateServiceResponse { +impl<'de> serde::Deserialize<'de> for UpdateServiceInstanceResponse { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where D: serde::Deserializer<'de>, { const FIELDS: &[&str] = &[ - "service", + "service_instance", + "serviceInstance", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { - Service, + ServiceInstance, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -24270,7 +22893,7 @@ impl<'de> serde::Deserialize<'de> for UpdateServiceResponse { E: serde::de::Error, { match value { - "service" => Ok(GeneratedField::Service), + "serviceInstance" | "service_instance" => Ok(GeneratedField::ServiceInstance), _ => Ok(GeneratedField::__SkipField__), } } @@ -24280,39 +22903,39 @@ impl<'de> serde::Deserialize<'de> for UpdateServiceResponse { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = UpdateServiceResponse; + type Value = UpdateServiceInstanceResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.UpdateServiceResponse") + formatter.write_str("struct saas_rs.user.v1.UpdateServiceInstanceResponse") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut service__ = None; + let mut service_instance__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::Service => { - if service__.is_some() { - return Err(serde::de::Error::duplicate_field("service")); + GeneratedField::ServiceInstance => { + if service_instance__.is_some() { + return Err(serde::de::Error::duplicate_field("serviceInstance")); } - service__ = map_.next_value()?; + service_instance__ = map_.next_value()?; } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } } } - Ok(UpdateServiceResponse { - service: service__, + Ok(UpdateServiceInstanceResponse { + service_instance: service_instance__, }) } } - deserializer.deserialize_struct("saas_rs.user.v1.UpdateServiceResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("saas_rs.user.v1.UpdateServiceInstanceResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for UpdateSshKeyRequest { +impl serde::Serialize for UpdateServiceRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -24323,27 +22946,26 @@ impl serde::Serialize for UpdateSshKeyRequest { if true { len += 1; } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateSshKeyRequest", len)?; - if let Some(v) = self.ssh_key.as_ref() { - struct_ser.serialize_field("sshKey", v)?; + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateServiceRequest", len)?; + if let Some(v) = self.service.as_ref() { + struct_ser.serialize_field("service", v)?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for UpdateSshKeyRequest { +impl<'de> serde::Deserialize<'de> for UpdateServiceRequest { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where D: serde::Deserializer<'de>, { const FIELDS: &[&str] = &[ - "ssh_key", - "sshKey", + "service", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { - SshKey, + Service, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -24366,7 +22988,7 @@ impl<'de> serde::Deserialize<'de> for UpdateSshKeyRequest { E: serde::de::Error, { match value { - "sshKey" | "ssh_key" => Ok(GeneratedField::SshKey), + "service" => Ok(GeneratedField::Service), _ => Ok(GeneratedField::__SkipField__), } } @@ -24376,39 +22998,39 @@ impl<'de> serde::Deserialize<'de> for UpdateSshKeyRequest { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = UpdateSshKeyRequest; + type Value = UpdateServiceRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.UpdateSshKeyRequest") + formatter.write_str("struct saas_rs.user.v1.UpdateServiceRequest") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut ssh_key__ = None; + let mut service__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::SshKey => { - if ssh_key__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKey")); + GeneratedField::Service => { + if service__.is_some() { + return Err(serde::de::Error::duplicate_field("service")); } - ssh_key__ = map_.next_value()?; + service__ = map_.next_value()?; } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } } } - Ok(UpdateSshKeyRequest { - ssh_key: ssh_key__, + Ok(UpdateServiceRequest { + service: service__, }) } } - deserializer.deserialize_struct("saas_rs.user.v1.UpdateSshKeyRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("saas_rs.user.v1.UpdateServiceRequest", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for UpdateSshKeyResponse { +impl serde::Serialize for UpdateServiceResponse { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -24419,27 +23041,26 @@ impl serde::Serialize for UpdateSshKeyResponse { if true { len += 1; } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateSshKeyResponse", len)?; - if let Some(v) = self.ssh_key.as_ref() { - struct_ser.serialize_field("sshKey", v)?; + let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.UpdateServiceResponse", len)?; + if let Some(v) = self.service.as_ref() { + struct_ser.serialize_field("service", v)?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for UpdateSshKeyResponse { +impl<'de> serde::Deserialize<'de> for UpdateServiceResponse { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where D: serde::Deserializer<'de>, { const FIELDS: &[&str] = &[ - "ssh_key", - "sshKey", + "service", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { - SshKey, + Service, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -24462,7 +23083,7 @@ impl<'de> serde::Deserialize<'de> for UpdateSshKeyResponse { E: serde::de::Error, { match value { - "sshKey" | "ssh_key" => Ok(GeneratedField::SshKey), + "service" => Ok(GeneratedField::Service), _ => Ok(GeneratedField::__SkipField__), } } @@ -24472,36 +23093,36 @@ impl<'de> serde::Deserialize<'de> for UpdateSshKeyResponse { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = UpdateSshKeyResponse; + type Value = UpdateServiceResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.UpdateSshKeyResponse") + formatter.write_str("struct saas_rs.user.v1.UpdateServiceResponse") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut ssh_key__ = None; + let mut service__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::SshKey => { - if ssh_key__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKey")); + GeneratedField::Service => { + if service__.is_some() { + return Err(serde::de::Error::duplicate_field("service")); } - ssh_key__ = map_.next_value()?; + service__ = map_.next_value()?; } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } } } - Ok(UpdateSshKeyResponse { - ssh_key: ssh_key__, + Ok(UpdateServiceResponse { + service: service__, }) } } - deserializer.deserialize_struct("saas_rs.user.v1.UpdateSshKeyResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("saas_rs.user.v1.UpdateServiceResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for UploadFileRequest { @@ -27015,211 +25636,3 @@ impl<'de> serde::Deserialize<'de> for ValidateServiceResponse { deserializer.deserialize_struct("saas_rs.user.v1.ValidateServiceResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for ValidateSshKeyRequest { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.ValidateSshKeyRequest", len)?; - if let Some(v) = self.ssh_key.as_ref() { - struct_ser.serialize_field("sshKey", v)?; - } - if true { - struct_ser.serialize_field("existing", &self.existing)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for ValidateSshKeyRequest { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "ssh_key", - "sshKey", - "existing", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - SshKey, - Existing, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "sshKey" | "ssh_key" => Ok(GeneratedField::SshKey), - "existing" => Ok(GeneratedField::Existing), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = ValidateSshKeyRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.ValidateSshKeyRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut ssh_key__ = None; - let mut existing__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::SshKey => { - if ssh_key__.is_some() { - return Err(serde::de::Error::duplicate_field("sshKey")); - } - ssh_key__ = map_.next_value()?; - } - GeneratedField::Existing => { - if existing__.is_some() { - return Err(serde::de::Error::duplicate_field("existing")); - } - existing__ = Some(map_.next_value()?); - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(ValidateSshKeyRequest { - ssh_key: ssh_key__, - existing: existing__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.ValidateSshKeyRequest", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for ValidateSshKeyResponse { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if true { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("saas_rs.user.v1.ValidateSshKeyResponse", len)?; - if true { - struct_ser.serialize_field("errors", &self.errors)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for ValidateSshKeyResponse { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "errors", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Errors, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "errors" => Ok(GeneratedField::Errors), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = ValidateSshKeyResponse; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct saas_rs.user.v1.ValidateSshKeyResponse") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut errors__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Errors => { - if errors__.is_some() { - return Err(serde::de::Error::duplicate_field("errors")); - } - errors__ = Some(map_.next_value()?); - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(ValidateSshKeyResponse { - errors: errors__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("saas_rs.user.v1.ValidateSshKeyResponse", FIELDS, GeneratedVisitor) - } -}