Skip to content

Commit

Permalink
Replace some vec![...].into_iter().collect::<BTreeMap>() with `[...…
Browse files Browse the repository at this point in the history 
…].into()`
  • Loading branch information
@Arnavion
Arnavion committed Aug 24, 2022
1 parent a51089f commit 39ea204
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
36 changes: 18 additions & 18 deletions k8s-openapi-derive/src/custom_resource_definition.rs
View file
Expand Up @@ -215,10 +215,10 @@ impl super::CustomDerive for CustomResourceDefinition {
title: String::new(),
version: String::new(),
},
definitions: vec![
definitions: [
(swagger20::DefinitionPath(cr_name.clone()), swagger20::Schema {
description: Some(format!("Custom resource for `{cr_spec_name}`")),
kind: swagger20::SchemaKind::Properties(vec![
kind: swagger20::SchemaKind::Properties([
(swagger20::PropertyName("apiVersion".to_owned()), (swagger20::Schema {
description: Some("APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: <https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources>".to_owned()),
kind: swagger20::SchemaKind::Ty(swagger20::Type::String { format: None }),
Expand Down Expand Up @@ -273,7 +273,7 @@ impl super::CustomDerive for CustomResourceDefinition {
list_kind: Some(format!("{cr_name}List")),
impl_deep_merge,
}),
].into_iter().collect(),
].into(),
operations: vec![
swagger20::Operation {
description: Some(format!("Create a `{cr_name}`")),
Expand All @@ -285,7 +285,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(body_parameter.clone()),
namespace_parameter.clone(),
].into_iter().flatten().collect(),
Expand All @@ -304,7 +304,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(name_parameter.clone()),
namespace_parameter.clone(),
Some(std::sync::Arc::new(swagger20::Parameter {
Expand Down Expand Up @@ -338,7 +338,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
namespace_parameter.clone(),
Some(std::sync::Arc::new(swagger20::Parameter {
location: swagger20::ParameterLocation::Query,
Expand Down Expand Up @@ -386,7 +386,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
namespace_parameter.clone(),
Some(std::sync::Arc::new(swagger20::Parameter {
location: swagger20::ParameterLocation::Query,
Expand Down Expand Up @@ -419,7 +419,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(std::sync::Arc::new(swagger20::Parameter {
location: swagger20::ParameterLocation::Body,
name: "body".to_owned(),
Expand Down Expand Up @@ -468,7 +468,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(std::sync::Arc::new(swagger20::Parameter {
location: swagger20::ParameterLocation::Body,
name: "body".to_owned(),
Expand Down Expand Up @@ -517,12 +517,12 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(name_parameter.clone()),
namespace_parameter.clone(),
].into_iter().flatten().collect(),
path: swagger20::Path(format!("/apis/{group}/{version}{namespace_path_component}/{plural}/{{name}}")),
responses: swagger20::OperationResponses::Map(vec![
responses: swagger20::OperationResponses::Map([
(http::StatusCode::OK, swagger20::Schema {
description: Some("OK".to_owned()),
kind: swagger20::SchemaKind::Ref(swagger20::RefPath {
Expand All @@ -533,7 +533,7 @@ impl super::CustomDerive for CustomResourceDefinition {
list_kind: None,
impl_deep_merge: true,
}),
].into_iter().collect()),
].into()),
tag: None,
},

Expand All @@ -547,12 +547,12 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(name_parameter.clone()),
namespace_parameter.clone(),
].into_iter().flatten().collect(),
path: swagger20::Path(format!("/apis/{group}/{version}{namespace_path_component}/{plural}/{{name}}/status")),
responses: swagger20::OperationResponses::Map(vec![
responses: swagger20::OperationResponses::Map([
(http::StatusCode::OK, swagger20::Schema {
description: Some("OK".to_owned()),
kind: swagger20::SchemaKind::Ref(swagger20::RefPath {
Expand All @@ -563,7 +563,7 @@ impl super::CustomDerive for CustomResourceDefinition {
list_kind: None,
impl_deep_merge: true,
}),
].into_iter().collect()),
].into()),
tag: None,
},

Expand All @@ -577,7 +577,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(body_parameter.clone()),
Some(name_parameter.clone()),
namespace_parameter.clone(),
Expand Down Expand Up @@ -612,7 +612,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
Some(body_parameter),
Some(name_parameter),
namespace_parameter.clone(),
Expand Down Expand Up @@ -647,7 +647,7 @@ impl super::CustomDerive for CustomResourceDefinition {
kind: cr_name.clone(),
version: version.clone(),
}),
parameters: vec![
parameters: [
namespace_parameter,
Some(std::sync::Arc::new(swagger20::Parameter {
location: swagger20::ParameterLocation::Query,
Expand Down
20 changes: 10 additions & 10 deletions k8s-openapi-tests/src/custom_resource_definition.rs
View file
Expand Up @@ -89,10 +89,10 @@ async fn test() {

let custom_resource_validation = apiextensions::CustomResourceValidation {
open_api_v3_schema: Some(apiextensions::JSONSchemaProps {
properties: Some(vec![
properties: Some([
("spec".to_string(), apiextensions::JSONSchemaProps {
type_: Some("object".to_owned()),
properties: Some(vec![
properties: Some([
("prop1".to_string(), apiextensions::JSONSchemaProps {
type_: Some("string".to_string()),
..Default::default()
Expand All @@ -110,14 +110,14 @@ async fn test() {
type_: Some("integer".to_string()),
..Default::default()
}),
].into_iter().collect()),
].into()),
required: Some(vec![
"prop1".to_string(),
"prop2".to_string(),
]),
..Default::default()
}),
].into_iter().collect()),
].into()),
type_: Some("object".to_owned()),
..Default::default()
}),
Expand Down Expand Up @@ -279,13 +279,13 @@ async fn test() {


// Create invalid CR.
let fb2 = serde_json::Value::Object(vec![
let fb2 = serde_json::Value::Object([
("apiVersion".to_string(), serde_json::Value::String(<FooBar as k8s_openapi::Resource>::API_VERSION.to_owned())),
("kind".to_string(), serde_json::Value::String(<FooBar as k8s_openapi::Resource>::KIND.to_owned())),
("metadata".to_string(), serde_json::Value::Object(vec![
("metadata".to_string(), serde_json::Value::Object([
("name".to_string(), serde_json::Value::String("fb2".to_string())),
].into_iter().collect())),
("spec".to_string(), serde_json::Value::Object(vec![
("spec".to_string(), serde_json::Value::Object([
("prop1".to_string(), serde_json::Value::String("value1".to_string())),
].into_iter().collect())),
].into_iter().collect());
Expand All @@ -300,13 +300,13 @@ async fn test() {
(other, status_code) => panic!("{other:?} {status_code}"),
}

let fb3 = serde_json::Value::Object(vec![
let fb3 = serde_json::Value::Object([
("apiVersion".to_string(), serde_json::Value::String(<FooBar as k8s_openapi::Resource>::API_VERSION.to_owned())),
("kind".to_string(), serde_json::Value::String(<FooBar as k8s_openapi::Resource>::KIND.to_owned())),
("metadata".to_string(), serde_json::Value::Object(vec![
("metadata".to_string(), serde_json::Value::Object([
("name".to_string(), serde_json::Value::String("fb3".to_string())),
].into_iter().collect())),
("spec".to_string(), serde_json::Value::Object(vec![
("spec".to_string(), serde_json::Value::Object([
("prop1".to_string(), serde_json::Value::String("value1".to_string())),
("prop2".to_string(), serde_json::Value::Bool(true)),
].into_iter().collect())),
Expand Down
12 changes: 6 additions & 6 deletions k8s-openapi-tests/src/patch.rs
View file
Expand Up @@ -12,16 +12,16 @@ async fn deployment() {
let deployment_spec = apps::DeploymentSpec {
replicas: Some(1),
selector: meta::LabelSelector {
match_labels: Some(vec![
match_labels: Some([
("k8s-openapi-tests-patch-deployment-key".to_owned(), "k8s-openapi-tests-patch-deployment-value".to_owned()),
].into_iter().collect()),
].into()),
..Default::default()
},
template: api::PodTemplateSpec {
metadata: Some(meta::ObjectMeta {
labels: Some(vec![
labels: Some([
("k8s-openapi-tests-patch-deployment-key".to_owned(), "k8s-openapi-tests-patch-deployment-value".to_owned()),
].into_iter().collect()),
].into()),
..Default::default()
}),
spec: Some(api::PodSpec {
Expand Down Expand Up @@ -56,12 +56,12 @@ async fn deployment() {

// Use JSON patch to patch deployment with alpine:3.7 container
let patch = meta::Patch::Json(vec![
serde_json::Value::Object(vec![
serde_json::Value::Object([
("op".to_owned(), serde_json::Value::String("test".to_owned())),
("path".to_owned(), serde_json::Value::String("/spec/template/spec/containers/0/image".to_owned())),
("value".to_owned(), serde_json::Value::String("alpine:3.6".to_owned())),
].into_iter().collect()),
serde_json::Value::Object(vec![
serde_json::Value::Object([
("op".to_owned(), serde_json::Value::String("replace".to_owned())),
("path".to_owned(), serde_json::Value::String("/spec/template/spec/containers/0/image".to_owned())),
("value".to_owned(), serde_json::Value::String("alpine:3.7".to_owned())),
Expand Down

0 comments on commit 39ea204

Please sign in to comment.