Reducing common struct types

Signed-off-by: Dawid Nowak <[email protected]>

Author: dawid-nowak

gateway-api/src/apis/mod.rs

@@ -1,3 +1,4 @@
 pub mod experimental;
 pub mod standard;
+
 pub mod processed;

gateway-api/src/apis/processed/common_types.rs

@@ -10,18 +10,9 @@ mod prelude {
 }
 use self::prelude::*;
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct RouteRef {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub group: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub kind: Option<String>,
+pub struct HTTPHeader {
     pub name: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub namespace: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub port: Option<i32>,
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "sectionName")]
-    pub section_name: Option<String>,
+    pub value: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
 pub struct MirrorBackendRef {
@@ -42,105 +33,210 @@ pub struct Kind {
     pub kind: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct ExtensionBackendRef {
-    pub group: String,
-    pub kind: String,
-    pub name: String,
-}
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
 pub struct GatewayAddress {
     #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
     pub r#type: Option<String>,
     pub value: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HeaderModifierRules {
+pub struct RouteRef {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub group: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub kind: Option<String>,
     pub name: String,
-    pub value: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub namespace: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub port: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "sectionName")]
+    pub section_name: Option<String>,
 }
-/// RequestRedirect defines a schema for a filter that responds to the
-/// request with an HTTP redirection.
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct ExtensionBackendRef {
+    pub group: String,
+    pub kind: String,
+    pub name: String,
+}
+/// GRPCHeaderMatch describes how to select a gRPC route by matching gRPC request
+/// headers.
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
+pub enum HeaderMatchesType {
+    Exact,
+    RegularExpression,
+}
+/// Path defines parameters used to modify the path of the incoming request.
+/// The modified path is then used to construct the `Location` header. When
+/// empty, the request path is used as-is.
 ///
-/// Support: Core
+/// Support: Extended
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum FiltersHTTPRedirectRequestRouteRulesScheme {
-    #[serde(rename = "http")]
-    Http,
-    #[serde(rename = "https")]
-    Https,
+pub enum HTTPPathType {
+    ReplaceFullPath,
+    ReplacePrefixMatch,
 }
 /// RequestRedirect defines a schema for a filter that responds to the
 /// request with an HTTP redirection.
 ///
 /// Support: Core
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum CodeFiltersHTTPRedirectRequestRouteRulesStatus {
+pub enum RedirectStatusCode {
     #[serde(rename = "301")]
     r#_301,
     #[serde(rename = "302")]
     r#_302,
 }
-/// GRPCRouteFilter defines processing steps that must be completed during the
-/// request or response lifecycle. GRPCRouteFilters are meant as an extension
+/// HTTPRouteFilter defines processing steps that must be completed during the
+/// request or response lifecycle. HTTPRouteFilters are meant as an extension
 /// point to express processing that may be done in Gateway implementations. Some
 /// examples include request or response modification, implementing
 /// authentication strategies, rate-limiting, and traffic shaping. API
 /// guarantee/conformance is defined based on the type of the filter.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum FiltersGRPCRouteRulesType {
-    ResponseHeaderModifier,
+pub enum HTTPFilterType {
     RequestHeaderModifier,
+    ResponseHeaderModifier,
     RequestMirror,
+    RequestRedirect,
+    #[serde(rename = "URLRewrite")]
+    UrlRewrite,
     ExtensionRef,
 }
-/// GRPCHeaderMatch describes how to select a gRPC route by matching gRPC request
-/// headers.
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum MatchesRouteRulesType {
-    Exact,
-    RegularExpression,
-}
-/// Path defines parameters used to modify the path of the incoming request.
-/// The modified path is then used to construct the `Location` header. When
-/// empty, the request path is used as-is.
+/// RequestRedirect defines a schema for a filter that responds to the
+/// request with an HTTP redirection.
 ///
-/// Support: Extended
+/// Support: Core
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum FiltersHTTPPathRouteRulesType {
-    ReplaceFullPath,
-    ReplacePrefixMatch,
+pub enum HTTPRedirectScheme {
+    #[serde(rename = "http")]
+    Http,
+    #[serde(rename = "https")]
+    Https,
 }
-/// HTTPRouteFilter defines processing steps that must be completed during the
-/// request or response lifecycle. HTTPRouteFilters are meant as an extension
+/// GRPCRouteFilter defines processing steps that must be completed during the
+/// request or response lifecycle. GRPCRouteFilters are meant as an extension
 /// point to express processing that may be done in Gateway implementations. Some
 /// examples include request or response modification, implementing
 /// authentication strategies, rate-limiting, and traffic shaping. API
 /// guarantee/conformance is defined based on the type of the filter.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum FiltersHTTPRouteRulesType {
-    RequestHeaderModifier,
+pub enum GRPCFilterType {
     ResponseHeaderModifier,
+    RequestHeaderModifier,
     RequestMirror,
-    RequestRedirect,
-    #[serde(rename = "URLRewrite")]
-    UrlRewrite,
     ExtensionRef,
 }
-
-
-// Next attempt 
-
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct FilterMirrorRouteRules {
+pub struct ParentsRouteStatus {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub conditions: Option<Vec<Condition>>,
+    #[serde(rename = "controllerName")]
+    pub controller_name: String,
+    #[serde(rename = "parentRef")]
+    pub parent_ref: RouteRef,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct HTTPPathModifier {
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        rename = "replaceFullPath"
+    )]
+    pub replace_full_path: Option<String>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        rename = "replacePrefixMatch"
+    )]
+    pub replace_prefix_match: Option<String>,
+    #[serde(rename = "type")]
+    pub r#type: HTTPPathType,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct HeaderModifier {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub add: Option<Vec<HTTPHeader>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub remove: Option<Vec<String>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub set: Option<Vec<HTTPHeader>>,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct RequestMirrorModifier {
     #[serde(rename = "backendRef")]
     pub backend_ref: MirrorBackendRef,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct FilterHeaderRouteRules {
+pub struct HTTPRequestRewrite {
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub add: Option<Vec<HeaderModifierRules>>,
+    pub hostname: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub remove: Option<Vec<String>>,
+    pub path: Option<HTTPPathModifier>,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct HTTPRequestRedirect {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub hostname: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub set: Option<Vec<HeaderModifierRules>>,
+    pub path: Option<HTTPPathModifier>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub port: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub scheme: Option<HTTPRedirectScheme>,
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "statusCode")]
+    pub status_code: Option<i64>,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct GRPCRouteFilter {
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "extensionRef")]
+    pub extension_ref: Option<ExtensionBackendRef>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        rename = "requestHeaderModifier"
+    )]
+    pub request_header_modifier: Option<HeaderModifier>,
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "requestMirror")]
+    pub request_mirror: Option<RequestMirrorModifier>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        rename = "responseHeaderModifier"
+    )]
+    pub response_header_modifier: Option<HeaderModifier>,
+    #[serde(rename = "type")]
+    pub r#type: GRPCFilterType,
+}
+
+
+// Next attempt 
+
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct HTTPRouteFilter {
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "extensionRef")]
+    pub extension_ref: Option<ExtensionBackendRef>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        rename = "requestHeaderModifier"
+    )]
+    pub request_header_modifier: Option<HeaderModifier>,
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "requestMirror")]
+    pub request_mirror: Option<RequestMirrorModifier>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        rename = "requestRedirect"
+    )]
+    pub request_redirect: Option<HTTPRequestRedirect>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        rename = "responseHeaderModifier"
+    )]
+    pub response_header_modifier: Option<HeaderModifier>,
+    #[serde(rename = "type")]
+    pub r#type: HTTPFilterType,
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "urlRewrite")]
+    pub url_rewrite: Option<HTTPRequestRewrite>,
 }

gateway-api/src/apis/processed/enum_defaults.rs

@@ -1,26 +1,20 @@
 use super::common_types::*;
 // WARNING: generated file - manual changes will be overriden
 
-impl Default for FiltersGRPCRouteRulesType {
+impl Default for GRPCFilterType {
     fn default() -> Self {
-        FiltersGRPCRouteRulesType::RequestHeaderModifier
+        GRPCFilterType::RequestHeaderModifier
     }
 }
 
-impl Default for FiltersHTTPPathRouteRulesType {
+impl Default for HTTPFilterType {
     fn default() -> Self {
-        FiltersHTTPPathRouteRulesType::ReplaceFullPath
+        HTTPFilterType::RequestHeaderModifier
     }
 }
 
-impl Default for FiltersHTTPRedirectRequestRouteRulesScheme {
+impl Default for HTTPPathType {
     fn default() -> Self {
-        FiltersHTTPRedirectRequestRouteRulesScheme::Http
-    }
-}
-
-impl Default for FiltersHTTPRouteRulesType {
-    fn default() -> Self {
-        FiltersHTTPRouteRulesType::RequestHeaderModifier
+        HTTPPathType::ReplaceFullPath
     }
 }