Added type reduction for enums and some more refactoring

Author: dawid-nowak

gateway-api/Cargo.toml

@@ -41,4 +41,11 @@ features = ["k8s-openapi/v1_32"]
 default = ["processed"]
 standard = []
 experimental = []
-processed=[]
+processed=[]
+
+
+[lints.clippy]
+derivable_impls="allow"
+doc_lazy_continuation="allow"
+tabs_in_doc_comments="allow"
+empty_line_after_doc_comments="allow"

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

@@ -10,18 +10,7 @@ mod prelude {
 }
 use self::prelude::*;
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HeaderModifierRules {
-    pub name: String,
-    pub value: String,
-}
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct Kind {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub group: Option<String>,
-    pub kind: String,
-}
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct MirrorBackendRef {
+pub struct RouteRef {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub group: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -31,9 +20,11 @@ pub struct MirrorBackendRef {
     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>,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct RouteRef {
+pub struct MirrorBackendRef {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub group: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -43,8 +34,18 @@ pub struct RouteRef {
     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>,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct Kind {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub group: Option<String>,
+    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 {
@@ -53,10 +54,77 @@ pub struct GatewayAddress {
     pub value: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct ExtensionBackendRef {
-    pub group: String,
-    pub kind: String,
+pub struct HeaderModifierRules {
     pub name: String,
+    pub value: String,
+}
+/// 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 FiltersHTTPRedirectRequestRouteRulesScheme {
+    #[serde(rename = "http")]
+    Http,
+    #[serde(rename = "https")]
+    Https,
+}
+/// 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 {
+    #[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
+/// 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,
+    RequestHeaderModifier,
+    RequestMirror,
+    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.
+///
+/// Support: Extended
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
+pub enum FiltersHTTPPathRouteRulesType {
+    ReplaceFullPath,
+    ReplacePrefixMatch,
+}
+/// 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 FiltersHTTPRouteRulesType {
+    RequestHeaderModifier,
+    ResponseHeaderModifier,
+    RequestMirror,
+    RequestRedirect,
+    #[serde(rename = "URLRewrite")]
+    UrlRewrite,
+    ExtensionRef,
 }
 
 

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

@@ -1,50 +1,26 @@
-// WARNING! generated file do not edit
+use super::common_types::*;
+// WARNING: generated file - manual changes will be overriden
 
-use super::httproutes::{
-    HTTPRouteRulesBackendRefsFiltersRequestRedirectPathType,
-    HTTPRouteRulesBackendRefsFiltersType,
-    HTTPRouteRulesBackendRefsFiltersUrlRewritePathType,
-    HTTPRouteRulesFiltersRequestRedirectPathType, HTTPRouteRulesFiltersType,
-    HTTPRouteRulesFiltersUrlRewritePathType,
-};
-use super::grpcroutes::{GRPCRouteRulesBackendRefsFiltersType, GRPCRouteRulesFiltersType};
-impl Default for GRPCRouteRulesBackendRefsFiltersType {
+impl Default for FiltersGRPCRouteRulesType {
     fn default() -> Self {
-        GRPCRouteRulesBackendRefsFiltersType::RequestHeaderModifier
+        FiltersGRPCRouteRulesType::RequestHeaderModifier
     }
 }
-impl Default for GRPCRouteRulesFiltersType {
-    fn default() -> Self {
-        GRPCRouteRulesFiltersType::RequestHeaderModifier
-    }
-}
-impl Default for HTTPRouteRulesBackendRefsFiltersRequestRedirectPathType {
-    fn default() -> Self {
-        HTTPRouteRulesBackendRefsFiltersRequestRedirectPathType::ReplaceFullPath
-    }
-}
-impl Default for HTTPRouteRulesBackendRefsFiltersType {
-    fn default() -> Self {
-        HTTPRouteRulesBackendRefsFiltersType::RequestHeaderModifier
-    }
-}
-impl Default for HTTPRouteRulesBackendRefsFiltersUrlRewritePathType {
-    fn default() -> Self {
-        HTTPRouteRulesBackendRefsFiltersUrlRewritePathType::ReplaceFullPath
-    }
-}
-impl Default for HTTPRouteRulesFiltersRequestRedirectPathType {
+
+impl Default for FiltersHTTPPathRouteRulesType {
     fn default() -> Self {
-        HTTPRouteRulesFiltersRequestRedirectPathType::ReplaceFullPath
+        FiltersHTTPPathRouteRulesType::ReplaceFullPath
     }
 }
-impl Default for HTTPRouteRulesFiltersType {
+
+impl Default for FiltersHTTPRedirectRequestRouteRulesScheme {
     fn default() -> Self {
-        HTTPRouteRulesFiltersType::RequestHeaderModifier
+        FiltersHTTPRedirectRequestRouteRulesScheme::Http
     }
 }
-impl Default for HTTPRouteRulesFiltersUrlRewritePathType {
+
+impl Default for FiltersHTTPRouteRulesType {
     fn default() -> Self {
-        HTTPRouteRulesFiltersUrlRewritePathType::ReplaceFullPath
+        FiltersHTTPRouteRulesType::RequestHeaderModifier
     }
 }

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

@@ -428,20 +428,7 @@ pub struct GRPCRouteRulesBackendRefsFilters {
     ///
     ///
     #[serde(rename = "type")]
-    pub r#type: GRPCRouteRulesBackendRefsFiltersType,
-}
-/// 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 GRPCRouteRulesBackendRefsFiltersType {
-    ResponseHeaderModifier,
-    RequestHeaderModifier,
-    RequestMirror,
-    ExtensionRef,
+    pub r#type: FiltersGRPCRouteRulesType,
 }
 /// GRPCRouteFilter defines processing steps that must be completed during the
 /// request or response lifecycle. GRPCRouteFilters are meant as an extension
@@ -521,20 +508,7 @@ pub struct GRPCRouteRulesFilters {
     ///
     ///
     #[serde(rename = "type")]
-    pub r#type: GRPCRouteRulesFiltersType,
-}
-/// 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 GRPCRouteRulesFiltersType {
-    ResponseHeaderModifier,
-    RequestHeaderModifier,
-    RequestMirror,
-    ExtensionRef,
+    pub r#type: FiltersGRPCRouteRulesType,
 }
 /// GRPCRouteMatch defines the predicate used to match requests to a given
 /// action. Multiple match types are ANDed together, i.e. the match will
@@ -579,17 +553,10 @@ pub struct GRPCRouteRulesMatchesHeaders {
     pub name: String,
     /// Type specifies how to match against the value of the header.
     #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
-    pub r#type: Option<GRPCRouteRulesMatchesHeadersType>,
+    pub r#type: Option<MatchesRouteRulesType>,
     /// Value is the value of the gRPC Header to be matched.
     pub value: String,
 }
-/// GRPCHeaderMatch describes how to select a gRPC route by matching gRPC request
-/// headers.
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum GRPCRouteRulesMatchesHeadersType {
-    Exact,
-    RegularExpression,
-}
 /// Method specifies a gRPC request service/method matcher. If this field is
 /// not specified, all services and methods will match.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
@@ -613,14 +580,7 @@ pub struct GRPCRouteRulesMatchesMethod {
     ///
     /// Support: Implementation-specific (RegularExpression)
     #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
-    pub r#type: Option<GRPCRouteRulesMatchesMethodType>,
-}
-/// Method specifies a gRPC request service/method matcher. If this field is
-/// not specified, all services and methods will match.
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum GRPCRouteRulesMatchesMethodType {
-    Exact,
-    RegularExpression,
+    pub r#type: Option<MatchesRouteRulesType>,
 }
 /// Status defines the current state of GRPCRoute.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]